Skip to content

Safer action -> schedule queue dataflow #15

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
hmh wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Safer action -> schedule queue dataflow #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0130af0
lmapd: workspace: encode filesystem names starting with . or _
hmh Mar 28, 2019
5af640f
lmapd: workspace: move data from actions to an incoming directory
hmh Mar 28, 2019
1966cd3
lmapd: workspace: handle the schedule incoming queue
hmh Mar 28, 2019
bd53c26
lmapd: workspace: handle output-to-own-schedule
hmh Apr 9, 2019
397d217
lmapd: workspace: request dirfd() and O_DIRECTORY definitions
hmh Aug 6, 2019
348bee3
lmapd: workspace: use S_ISDIR() instead of S_IFDIR
hmh Jan 8, 2021
98677dd
lmapd: workspace: restrict a schedule's active queue to regular files
hmh Jan 8, 2021
9503d92
lmapd: workspace: only move regular files to destination schedules
hmh Jan 8, 2021
4a75663
lmapd: workspace: protect private namespace for actions too
hmh Jan 8, 2021
25b512f
lmapd: runner: cleanup action workspace at schedule start
hmh Jan 7, 2021
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
30 changes: 23 additions & 7 deletions src/runner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,12 @@ schedule_exec(struct lmapd *lmapd, struct schedule *schedule)

// lmap_dbg("executing schedule '%s'", schedule->name);

/* avoid leftover data (possibly due to a crash) from
* previous runs of an action. */
for (act = schedule->actions; act; act = act->next) {
(void) lmapd_workspace_action_clean(lmapd, act);
}

event_base_gettimeofday_cached(lmapd->base, &t);

switch (schedule->mode) {
Expand Down Expand Up @@ -528,7 +534,7 @@ void
lmapd_cleanup(struct lmapd *lmapd)
{
pid_t pid;
int status, failed;
int status, failed, succeeded;
struct lmap *lmap;
struct timeval t;
struct action *action;
Expand Down Expand Up @@ -619,25 +625,34 @@ lmapd_cleanup(struct lmapd *lmapd)

/*
* Change schedule state back to enabled if all actions have
* left the running state.
* left the running state. If at least one action was executed
* and every action returned success, clean up the schedule
* input processing queue.
*/

if (schedule->state == LMAP_SCHEDULE_STATE_RUNNING) {
schedule->state = LMAP_SCHEDULE_STATE_ENABLED;
if (schedule->cnt_active_suppressions) {
schedule->state = LMAP_SCHEDULE_STATE_SUPPRESSED;
}
failed = 0;
succeeded = failed = 0;
for (action = schedule->actions; action; action = action->next) {
if (action->state == LMAP_ACTION_STATE_RUNNING) {
schedule->state = LMAP_SCHEDULE_STATE_RUNNING;
}
if (action->last_status) {
failed++;
failed = 1;
} else {
succeeded = 1;
}
}
if (schedule->state != LMAP_SCHEDULE_STATE_RUNNING && failed) {
schedule->cnt_failures++;
if (schedule->state != LMAP_SCHEDULE_STATE_RUNNING) {
if (failed) {
schedule->cnt_failures++;
} else if (succeeded) {
/* there was at least one action, and none failed */
lmapd_workspace_schedule_clean(lmapd, schedule);
}
}
}
}
Expand Down Expand Up @@ -694,7 +709,8 @@ execute_cb(struct lmapd *lmapd, struct event *event)
event_base_gettimeofday_cached(lmapd->base, &t);
sched->cycle_number = (t.tv_sec / event->cycle_interval) * event->cycle_interval;
}


lmapd_workspace_schedule_move(lmapd, sched);
schedule_exec(lmapd, sched);
if (event->type == LMAP_EVENT_TYPE_ONE_OFF
|| event->type == LMAP_EVENT_TYPE_IMMEDIATE
Expand Down
Loading