Skip to content

Fix: do not query the run status of every scheduled task in the schedule loop #3072

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
TheBeast85 wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −8
Open

Fix: do not query the run status of every scheduled task in the schedule loop #3072

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
37 changes: 29 additions & 8 deletions src/manage_sql_schedules.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,8 @@ init_task_schedule_iterator (iterator_t* iterator)
" schedules.id, tasks.schedule_next_time,"
" schedules.icalendar, schedules.timezone,"
" schedules.duration,"
" users.uuid, users.name"
" users.uuid, users.name,"
" tasks.run_status"
" FROM tasks, schedules, users"
" WHERE tasks.schedule = schedules.id"
" AND tasks.hidden = 0"
Expand Down Expand Up @@ -819,6 +820,23 @@ DEF_ACCESS (task_schedule_iterator_owner_uuid, 7);
*/
DEF_ACCESS (task_schedule_iterator_owner_name, 8);

/**
* @brief Get the run status from a task schedule iterator.
*
* Comes with the row. The three due checks each used to ask the database for
* it separately, once per row and once per pass of the schedule loop.
*
* @param[in] iterator Iterator.
*
* @return Task run status.
*/
static task_status_t
task_schedule_iterator_run_status (iterator_t* iterator)
{
if (iterator->done) return TASK_STATUS_DONE;
return (task_status_t) iterator_int (iterator, 9);
}

/**
* @brief Get the start due state from a task schedule iterator.
*
Expand All @@ -837,7 +855,7 @@ task_schedule_iterator_start_due (iterator_t* iterator)
if (task_schedule_iterator_next_time (iterator) == 0)
return FALSE;

run_status = task_run_status (task_schedule_iterator_task (iterator));
run_status = task_schedule_iterator_run_status (iterator);
start_time = task_schedule_iterator_next_time (iterator);

if ((run_status == TASK_STATUS_DONE
Expand Down Expand Up @@ -922,18 +940,21 @@ task_schedule_iterator_stop_due (iterator_t* iterator)
report_t report;
task_status_t run_status;

report = task_running_report (task_schedule_iterator_task (iterator));
if (report && (report_scheduled (report) == 0))
return FALSE;

run_status = task_run_status (task_schedule_iterator_task (iterator));
run_status = task_schedule_iterator_run_status (iterator);

if (run_status == TASK_STATUS_RUNNING
|| run_status == TASK_STATUS_REQUESTED
|| run_status == TASK_STATUS_QUEUED)
{
time_t now, start;

/* Only a task that is on its way can have a running report, so the
* lookup - and the run status query inside it - is not needed for
* any of the others. */
report = task_running_report (task_schedule_iterator_task (iterator));
if (report && (report_scheduled (report) == 0))
return FALSE;

now = time (NULL);

start = icalendar_next_time_from_string (icalendar, time(NULL), zone,
Expand Down Expand Up @@ -1009,7 +1030,7 @@ task_schedule_iterator_timed_out (iterator_t* iterator)
if (start_time == 0)
return FALSE;

run_status = task_run_status (task_schedule_iterator_task (iterator));
run_status = task_schedule_iterator_run_status (iterator);
duration = task_schedule_iterator_duration (iterator);

return task_schedule_is_timed_out_common (run_status, start_time, duration);
Expand Down