61 Commits

Author	SHA1	Message	Date
Gareth J. Greenaway	8935e3c58b	Porting #50216 to fluorine.	2018-10-26 12:03:51 -07:00
rallytime	8fed338708	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/spm/pkgfiles/local.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py	2018-10-25 10:31:06 -04:00
Gareth J. Greenaway	685509fae3	Fixing an issue when a combination of the when parameter as a list plus using the splay parameter would cause the schedule to continuously run jobs in an endless loop, regardless of if their scheduled time had been receached. Also fixing a related issue where scheduled jobs that rely on _next_fire_time were not being run as the corrected splayed time but rather running at the original scheduled time. Adding new tests.	2018-10-24 17:22:37 -07:00
Gareth J. Greenaway	d232dfb9b7	Update test_eval.py	2018-10-24 09:37:23 -07:00
Gareth J. Greenaway	d8d8559b75	Fixing lint	2018-10-23 19:09:02 -07:00
Gareth J. Greenaway	d2d0622a6d	Back porting #49871 to 2018.3. Adding some additional changes to ensure they are passing on OS X.	2018-10-23 15:58:59 -07:00
Gareth J. Greenaway	adb1e79723	Apply scheduler fixes and tests from #49104 to 2018.3	2018-10-18 08:27:59 -07:00
Gareth J. Greenaway	76f9e4877a	Fixing lint	2018-10-02 15:53:28 -07:00
Gareth J. Greenaway	200e0ea1cf	Updating various scheduler tests to ensure they're passing on OS X	2018-10-02 14:53:46 -07:00
Gareth J. Greenaway	596e58ba20	Bulking up the seconds, minutes, hours and days eval tests to ensure _next_run_time is correct. Adding a run_seconds_skip to ensure skipping is working with time elements and the _next_fire_time is populated.	2018-08-16 10:56:27 -07:00
Gareth J. Greenaway	c68f6bee8e	Do not log about various things like jid_include and max_running unless the job is set to run. If the job contains _seconds, eg. it's using seconds, minutes, hours, etc. then only set the _next_fire_time if the job actually runs. Adding more tests to test simple scenarios when seconds, minutes, hours and days to ensure we get multiple scheduled job runs when they're expected to run.	2018-08-13 18:07:21 -07:00
rallytime	a5358901ab	Rename new test in scheduler tests ... `test_eval_enabled` already exists upstream. Rename the test to something else since it is a slightly different test.	2018-08-10 16:40:00 -04:00
rallytime	5ff1ddb0dd	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/cmdmod.py - salt/utils/schedule.py - tests/integration/files/conf/master - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py - tests/integration/scheduler/test_eval.py	2018-08-10 14:18:34 -04:00
Gareth J. Greenaway	aff1b8f6d4	Lint.	2018-08-08 14:33:25 -07:00
Gareth J. Greenaway	8935c08141	Fixing a bug that occurs if the "enabled" key is present in the scheduler items dictionary. Adding a test to ensure scheduler runs as expected when that key is present.	2018-08-08 11:44:13 -07:00
Nicole Thomas	07291d2c25	Merge branch 'develop' into 46462_global_splay	2018-04-05 11:18:09 -04:00
rallytime	57307e4b95	Fix lint errors on develop branch	2018-03-26 09:01:31 -04:00
Gareth J. Greenaway	e0da7c799e	Removing some duplicate code when handling "when" schedule items. Moving tests looking for errors in test_errors. Adding new tests to account for other error situations.	2018-03-21 13:05:59 -07:00
Gareth J. Greenaway	a82fa7aa7b	Adding the ability to set a global splay for all jobs in the scheduler. Useful for setting splay to internal jobs. Also adding additional integration tests to test global splay as well as per job splay options.	2018-03-20 12:10:36 -07:00
Nicole Thomas	36a64ab2d8	Lint: Remove extra blank line	2018-03-19 17:03:25 -04:00
Gareth J. Greenaway	5661357288	Fixing a bug that would result in constant changes using the schedule state module when a job was added with run_on_start. Adding an eval test to test run_on_start functionality.	2018-03-19 09:34:18 -07:00
Gareth J. Greenaway	da9a9b6e37	Fixing a bug that would result in constant changes using the schedule state module when a job was added with run_on_start. Adding an eval test to test run_on_start functionality.	2018-03-19 09:23:22 -07:00
Gareth J. Greenaway	5fe32a9fb3	Fixing a couple typos. Adding missing job name variable into functions that use it in error reporting. Fixing up various strings used in error reporting and logging.	2018-03-01 16:02:22 -08:00
Gareth J. Greenaway	cde50c6dab	Fixing lint	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	2aa9a84b28	Adding changes from #45323	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	65561441e5	Add changes from PR #46143 to develop	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	e23da417d5	Fixing a couple typos. Converting the code to handle after & until to sub functions.	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	dcc5deaea5	Porting #46084 to Develop	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	0d4647c2dd	Removing unnecessary log.	2018-02-21 13:14:05 -08:00
Gareth J. Greenaway	2df1866cc1	Adding a internal reset function to scheduler. Calling reset between schedule tests to ensure schedule is empty and it is using defaults.	2018-02-21 13:00:19 -08:00
Gareth J. Greenaway	e8b0e64bf5	Removing debugging code	2018-02-20 11:11:24 -08:00
Gareth J. Greenaway	5a90e6db9e	merge conflict	2018-02-20 10:42:40 -08:00
Gareth J. Greenaway	1a636b1c71	Fixing typo. swapping out a format string for an additional with datetime.timedelta.	2018-02-20 10:34:57 -08:00
Gareth J. Greenaway	b5bde4e904	Fixing cron based schedule logic up. Removing debugging messages.	2018-02-20 10:34:56 -08:00
Gareth J. Greenaway	e9ebfc8226	swapping the scheduler to use datetime objects internally	2018-02-20 10:34:31 -08:00
Gareth J. Greenaway	29fea7c550	Updating skip_job and postpone_job to acceept date strings. Reverting skip_explicit and run_explicit to not be prefixed by an undercore.	2018-02-20 10:01:20 -08:00
Gareth J. Greenaway	5e15c28dfa	Swapping skip_job and postpone_job to send time in date string format instead of passing datetie objects across the event bus. Updating tests tto reflect changes. Updating others which fail when run with --scheduler option but run fine individually.	2018-02-20 10:01:19 -08:00
Gareth J. Greenaway	d37ac991a6	Fixing lint, unused imports	2018-02-20 10:01:19 -08:00
Gareth J. Greenaway	2559815eb5	Adding tests for after and until. Updating schedule unit tests. Adding skip_reason and friends for those two cases. Moving them to the end for evaluation.	2018-02-20 10:01:19 -08:00
Gareth J. Greenaway	f62f93c892	Fixing typo. swapping out a format string for an additional with datetime.timedelta.	2018-02-20 10:01:18 -08:00
Gareth J. Greenaway	ed898baf37	Fixing cron based schedule logic up. Removing debugging messages.	2018-02-20 10:01:18 -08:00
Gareth J. Greenaway	bc93552884	swapping the scheduler to use datetime objects internally	2018-02-20 10:01:18 -08:00
Nicole Thomas	be5f4eefab	Lint: Remove extra line	2018-02-15 14:00:59 -05:00
Gareth J. Greenaway	6d1018bd18	Porting PR #45844 to Develop branch. Doing this manually as a lot of the layout of utils/schedule.py has changed from Oxygen to Develop	2018-02-08 07:26:49 -08:00
Gareth J. Greenaway	09d960c0cb	Updating utils/schedule.py to be able to track when jobs are skipped because of the max_running parameter. This change moves that check out of handle_func and moves it to it's own function. Also updated skip tests to include a test that _skip_reason is included in the results when a job is skipped.	2018-02-07 11:39:10 -08:00
Gareth J. Greenaway	b23e5a7db2	Updating utils/schedule.py to be able to track when jobs are skipped because of the max_running parameter. This change moves that check out of handle_func and moves it to it's own function. Also updated skip tests to include a test that _skip_reason is included in the results when a job is skipped.	2018-02-07 11:39:09 -08:00
Gareth J. Greenaway	3c2f5d3396	fixing merge conflict	2018-01-17 12:35:56 -08:00
Gareth J. Greenaway	3d2d8c986f	Typo in the whens in grains	2018-01-17 12:07:11 -08:00
Gareth J. Greenaway	065c35b8a2	fixing lint	2018-01-17 12:07:11 -08:00
Gareth J. Greenaway	5064e63fdf	fixing merge conflict	2018-01-17 12:07:05 -08:00