Skip to content

fix: Fixed an issue which causes random scheduling of playbooks #1969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igorhrcek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Fixed an issue which causes random scheduling of playbooks #1969

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/robusta/core/schedule/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,24 @@ def __is_job_done(self, job: ScheduledJob) -> bool:
return (job.state.exec_count >= job.scheduling_params.repeat) and job.scheduling_params.repeat != -1

def __calc_job_delay_for_next_run(self, job: ScheduledJob):
if not isinstance(job.scheduling_params, CronScheduleRepeat): # calc initial delay only for non-cron triggers
# For cron schedules, calculate delay from current time to next occurrence
# Don't use last_exec_time_sec as it can be stale and cause negative delays
if isinstance(job.scheduling_params, CronScheduleRepeat):
now = time.time()
next_delay = croniter(job.scheduling_params.cron_expression, now).get_next() - now

# Only apply initial delay for brand new jobs (deployment race condition protection)
if job.state.job_status == JobStatus.NEW:
if isinstance(job.scheduling_params, DynamicDelayRepeat):
return job.scheduling_params.delay_periods[0]
else:
return INITIAL_SCHEDULE_DELAY_SEC
return max(next_delay, INITIAL_SCHEDULE_DELAY_SEC)

return next_delay

# For other scheduling types, use the original logic
if job.state.job_status == JobStatus.NEW:
if isinstance(job.scheduling_params, DynamicDelayRepeat):
return job.scheduling_params.delay_periods[0]
else:
return INITIAL_SCHEDULE_DELAY_SEC

if isinstance(job.scheduling_params, DynamicDelayRepeat):
next_delay_idx = min(job.state.exec_count, len(job.scheduling_params.delay_periods) - 1)
Expand Down