diff options
| author | Michael Marineau <michael.marineau@coreos.com> | 2014-05-12 09:26:16 +0200 |
|---|---|---|
| committer | Michal Sekletar <msekleta@redhat.com> | 2014-05-12 09:32:06 +0200 |
| commit | 1727a595225132eb73ec134b6979d9c713b42e8c (patch) | |
| tree | 2d3de7c13fdcde74febe3446a1e869a9fc51ae7b /src | |
| parent | fbbeb65a93e2f90f6576001b69def877cd98722d (diff) | |
job: always add waiting jobs to run queue during coldplug
commit 20a83d7bf was not equivalent to the original bug fix proposed by
Michal Sekletar <msekleta@redhat.com>. The committed version only added
the job to the run queue if the job had a timeout, which most jobs do
not have. Just re-ordering the code gets us the intended functionality
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/job.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/job.c b/src/core/job.c index 835cfe173b..dc4f44150c 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -1060,15 +1060,15 @@ int job_coldplug(Job *j) { if (r < 0) return r; + if (j->state == JOB_WAITING) + job_add_to_run_queue(j); + if (j->begin_usec == 0 || j->unit->job_timeout == 0) return 0; if (j->timer_event_source) j->timer_event_source = sd_event_source_unref(j->timer_event_source); - if (j->state == JOB_WAITING) - job_add_to_run_queue(j); - r = sd_event_add_time( j->manager->event, &j->timer_event_source, |