valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #45997 from garethgreenaway/2557_schedule_fixes_once

Browse Source 
[oxygen.rc1] scheduler once fixes
This commit is contained in:
Nicole Thomas 2018-02-13 11:18:06 -05:00 committed by GitHub
commit d72cf1dd6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/utils/schedule.py
View File

@ -940,8 +940,8 @@ class Schedule(object):
data['_next_scheduled_fire_time'] = now + data['_seconds']
elif 'once' in data:
if data['_next_fire_time'] and \
data['_next_fire_time'] < now - self.opts['loop_interval'] and \
if data['_next_fire_time']:
if data['_next_fire_time'] < now - self.opts['loop_interval'] or \
data['_next_fire_time'] > now and \
not data['_splay']:
continue
@ -950,21 +950,21 @@ class Schedule(object):
not data['_splay']:
once_fmt = data.get('once_fmt', '%Y-%m-%dT%H:%M:%S')
try:
once = datetime.datetime.strptime(data['once'],
_once = datetime.datetime.strptime(data['once'],
once_fmt)
data['_next_fire_time'] = int(
time.mktime(once.timetuple()))
data['_next_scheduled_fire_time'] = int(
time.mktime(once.timetuple()))
once = int(time.mktime(_once.timetuple()))
except (TypeError, ValueError):
log.error('Date string could not be parsed: %s, %s',
data['once'], once_fmt)
continue
# If _next_fire_time is less than now or greater
# than now, continue.
if data['_next_fire_time'] < now - self.opts['loop_interval'] and \
data['_next_fire_time'] > now:
if once < now - self.opts['loop_interval']:
continue
else:
data['_next_fire_time'] = once
data['_next_scheduled_fire_time'] = once
elif 'when' in data:
if not _WHEN_SUPPORTED:
@ -1363,8 +1363,8 @@ class Schedule(object):
else:
if not self.standalone:
data = self._check_max_running(func, data, self.opts)
run = data['run']
if run:
if multiprocessing_enabled:
thread_cls = salt.utils.process.SignalHandlingMultiprocessingProcess