diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-02 21:52:51 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-02 22:12:02 -0500 |
| commit | 6a371e23ee0e47827fb4e3aa469ed84da2599304 (patch) | |
| tree | 3ce1c39507ad8a9a20a19f52ebb58e424ba27f6b | |
| parent | c71ecee578fa2d89d13f11edd7b27001f663bbb5 (diff) | |
systemd: treat reload failure as failure
systemctl reload "suceeded" on stopped units, but it is documented
to fail in this case.
https://bugzilla.redhat.com/show_bug.cgi?id=1036845
| -rw-r--r-- | src/core/job.c | 11 | ||||
| -rw-r--r-- | src/core/job.h | 3 | ||||
| -rw-r--r-- | src/core/unit.c | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/core/job.c b/src/core/job.c index 557917a70b..ce97263f03 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -508,7 +508,7 @@ int job_run_and_invalidate(Job *j) { else if (t == UNIT_ACTIVATING) r = -EAGAIN; else - r = -ENOEXEC; + r = -EBADR; break; } @@ -537,8 +537,10 @@ int job_run_and_invalidate(Job *j) { if (j) { if (r == -EALREADY) r = job_finish_and_invalidate(j, JOB_DONE, true); - else if (r == -ENOEXEC) + else if (r == -EBADR) r = job_finish_and_invalidate(j, JOB_SKIPPED, true); + else if (r == -ENOEXEC) + r = job_finish_and_invalidate(j, JOB_INVALID, true); else if (r == -EAGAIN) { j->state = JOB_WAITING; m->n_running_jobs--; @@ -764,7 +766,7 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) { goto finish; } - if (result == JOB_FAILED) + if (result == JOB_FAILED || result == JOB_INVALID) j->manager->n_failed_jobs ++; job_uninstall(j); @@ -1119,7 +1121,8 @@ static const char* const job_result_table[_JOB_RESULT_MAX] = { [JOB_TIMEOUT] = "timeout", [JOB_FAILED] = "failed", [JOB_DEPENDENCY] = "dependency", - [JOB_SKIPPED] = "skipped" + [JOB_SKIPPED] = "skipped", + [JOB_INVALID] = "invalid", }; DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult); diff --git a/src/core/job.h b/src/core/job.h index c23a38029d..0500e1208b 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -97,7 +97,8 @@ enum JobResult { JOB_TIMEOUT, /* JobTimeout elapsed */ JOB_FAILED, /* Job failed */ JOB_DEPENDENCY, /* A required dependency job did not result in JOB_DONE */ - JOB_SKIPPED, /* JOB_RELOAD of inactive unit; negative result of JOB_VERIFY_ACTIVE */ + JOB_SKIPPED, /* Negative result of JOB_VERIFY_ACTIVE */ + JOB_INVALID, /* JOB_RELOAD of inactive unit */ _JOB_RESULT_MAX, _JOB_RESULT_INVALID = -1 }; diff --git a/src/core/unit.c b/src/core/unit.c index 50db86c424..81d21622d0 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1301,8 +1301,11 @@ int unit_reload(Unit *u) { if (state == UNIT_RELOADING) return -EALREADY; - if (state != UNIT_ACTIVE) + if (state != UNIT_ACTIVE) { + log_warning_unit(u->id, "Unit %s cannot be reloaded because it is inactive.", + u->id); return -ENOEXEC; + } following = unit_following(u); if (following) { |