mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
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.
This commit is contained in:
Gareth J. Greenaway
parent
9bd94e0d17
commit
b23e5a7db2
@ -151,6 +151,44 @@ class Schedule(object):
|
||||
schedule.update(opts_schedule)
|
||||
return schedule
|
||||
|
||||
def _check_max_running(self, func, data, opts):
|
||||
'''
|
||||
Return the schedule data structure
|
||||
'''
|
||||
# Check to see if there are other jobs with this
|
||||
# signature running. If there are more than maxrunning
|
||||
# jobs present then don't start another.
|
||||
# If jid_include is False for this job we can ignore all this
|
||||
# NOTE--jid_include defaults to True, thus if it is missing from the data
|
||||
# dict we treat it like it was there and is True
|
||||
data['run'] = True
|
||||
if 'jid_include' not in data or data['jid_include']:
|
||||
jobcount = 0
|
||||
for job in salt.utils.minion.running(self.opts):
|
||||
if 'schedule' in job:
|
||||
log.debug(
|
||||
'schedule.handle_func: Checking job against fun '
|
||||
'%s: %s', func, job
|
||||
)
|
||||
if data['name'] == job['schedule'] \
|
||||
and salt.utils.process.os_is_running(job['pid']):
|
||||
jobcount += 1
|
||||
log.debug(
|
||||
'schedule.handle_func: Incrementing jobcount, '
|
||||
'now %s, maxrunning is %s',
|
||||
jobcount, data['maxrunning']
|
||||
)
|
||||
if jobcount >= data['maxrunning']:
|
||||
log.debug(
|
||||
'schedule.handle_func: The scheduled job '
|
||||
'%s was not started, %s already running',
|
||||
data['name'], data['maxrunning']
|
||||
)
|
||||
data['_skip_reason'] = 'maxrunning'
|
||||
data['run'] = False
|
||||
return data
|
||||
return data
|
||||
|
||||
def persist(self):
|
||||
'''
|
||||
Persist the modified schedule into <<configdir>>/<<default_include>>/_schedule.conf
|
||||
@ -350,6 +388,11 @@ class Schedule(object):
|
||||
data['name'] = name
|
||||
log.info('Running Job: %s', name)
|
||||
|
||||
if not self.standalone:
|
||||
data = self._check_max_running(func, data, self.opts)
|
||||
|
||||
run = data['run']
|
||||
if run:
|
||||
multiprocessing_enabled = self.opts.get('multiprocessing', True)
|
||||
if multiprocessing_enabled:
|
||||
thread_cls = salt.utils.process.SignalHandlingMultiprocessingProcess
|
||||
@ -538,36 +581,6 @@ class Schedule(object):
|
||||
ret['jid']
|
||||
)
|
||||
|
||||
# Check to see if there are other jobs with this
|
||||
# signature running. If there are more than maxrunning
|
||||
# jobs present then don't start another.
|
||||
# If jid_include is False for this job we can ignore all this
|
||||
# NOTE--jid_include defaults to True, thus if it is missing from the data
|
||||
# dict we treat it like it was there and is True
|
||||
if 'jid_include' not in data or data['jid_include']:
|
||||
jobcount = 0
|
||||
for job in salt.utils.minion.running(self.opts):
|
||||
if 'schedule' in job:
|
||||
log.debug(
|
||||
'schedule.handle_func: Checking job against fun '
|
||||
'%s: %s', ret['fun'], job
|
||||
)
|
||||
if ret['schedule'] == job['schedule'] \
|
||||
and salt.utils.process.os_is_running(job['pid']):
|
||||
jobcount += 1
|
||||
log.debug(
|
||||
'schedule.handle_func: Incrementing jobcount, '
|
||||
'now %s, maxrunning is %s',
|
||||
jobcount, data['maxrunning']
|
||||
)
|
||||
if jobcount >= data['maxrunning']:
|
||||
log.debug(
|
||||
'schedule.handle_func: The scheduled job '
|
||||
'%s was not started, %s already running',
|
||||
ret['schedule'], data['maxrunning']
|
||||
)
|
||||
return False
|
||||
|
||||
if multiprocessing_enabled and not salt.utils.platform.is_windows():
|
||||
# Reconfigure multiprocessing logging after daemonizing
|
||||
log_setup.setup_multiprocessing_logging()
|
||||
@ -786,6 +799,11 @@ class Schedule(object):
|
||||
'skip_function',
|
||||
'skip_during_range']
|
||||
for job, data in six.iteritems(schedule):
|
||||
|
||||
# Clear out _skip_reason from previous runs
|
||||
if '_skip_reason' in data:
|
||||
del data['_skip_reason']
|
||||
|
||||
run = False
|
||||
|
||||
if job in _hidden and not data:
|
||||
@ -797,9 +815,6 @@ class Schedule(object):
|
||||
job, type(data)
|
||||
)
|
||||
continue
|
||||
# Job is disabled, continue
|
||||
if 'enabled' in data and not data['enabled']:
|
||||
continue
|
||||
if 'function' in data:
|
||||
func = data['function']
|
||||
elif 'func' in data:
|
||||
@ -1182,6 +1197,7 @@ class Schedule(object):
|
||||
if now <= start or now >= end:
|
||||
run = True
|
||||
else:
|
||||
data['_skip_reason'] = 'in_skip_range'
|
||||
run = False
|
||||
else:
|
||||
if start <= now <= end:
|
||||
@ -1191,6 +1207,7 @@ class Schedule(object):
|
||||
run = True
|
||||
func = self.skip_function
|
||||
else:
|
||||
data['_skip_reason'] = 'not_in_range'
|
||||
run = False
|
||||
else:
|
||||
log.error(
|
||||
@ -1257,6 +1274,7 @@ class Schedule(object):
|
||||
func = self.skip_function
|
||||
else:
|
||||
run = False
|
||||
data['_skip_reason'] = 'in_skip_range'
|
||||
data['_skipped_time'] = now
|
||||
data['_skipped'] = True
|
||||
else:
|
||||
@ -1294,6 +1312,7 @@ class Schedule(object):
|
||||
func = self.skip_function
|
||||
else:
|
||||
run = False
|
||||
data['_skip_reason'] = 'skip_explicit'
|
||||
data['_skipped_time'] = now
|
||||
data['_skipped'] = True
|
||||
else:
|
||||
|
||||
@ -99,6 +99,7 @@ class SchedulerSkipTest(ModuleCase, SaltReturnAssertsMixin):
|
||||
self.schedule.eval(now=run_time)
|
||||
ret = self.schedule.job_status('job1')
|
||||
self.assertNotIn('_last_run', ret)
|
||||
self.assertEqual(ret['_skip_reason'], 'in_skip_range')
|
||||
|
||||
# eval at 3:30pm, will run.
|
||||
run_time = int(time.mktime(dateutil_parser.parse('11/29/2017 3:30pm').timetuple()))
|
||||
@ -131,6 +132,7 @@ class SchedulerSkipTest(ModuleCase, SaltReturnAssertsMixin):
|
||||
self.schedule.eval(now=run_time)
|
||||
ret = self.schedule.job_status('job1')
|
||||
self.assertNotIn('_last_run', ret)
|
||||
self.assertEqual(ret['_skip_reason'], 'in_skip_range')
|
||||
|
||||
# eval at 3:30pm, will run.
|
||||
run_time = int(time.mktime(dateutil_parser.parse('11/29/2017 3:30pm').timetuple()))
|
||||
@ -164,6 +166,7 @@ class SchedulerSkipTest(ModuleCase, SaltReturnAssertsMixin):
|
||||
self.schedule.eval(now=run_time)
|
||||
ret = self.schedule.job_status('job1')
|
||||
self.assertNotIn('_last_run', ret)
|
||||
self.assertEqual(ret['_skip_reason'], 'in_skip_range')
|
||||
|
||||
# eval at 3:00:01pm, will run.
|
||||
run_time = int(time.mktime(dateutil_parser.parse('11/29/2017 3:00:01pm').timetuple()))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user