|
 |
6cb7994 |
From fd3b3868816e7b2bd78d4a908c36e1d285fb72e3 Mon Sep 17 00:00:00 2001
|
|
|
6cb7994 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
6cb7994 |
Date: Mon, 2 Dec 2013 21:52:51 -0500
|
|
|
6cb7994 |
Subject: [PATCH] systemd: treat reload failure as failure
|
|
|
6cb7994 |
|
|
|
6cb7994 |
systemctl reload "suceeded" on stopped units, but it is documented
|
|
|
6cb7994 |
to fail in this case.
|
|
|
6cb7994 |
|
|
|
6cb7994 |
https://bugzilla.redhat.com/show_bug.cgi?id=1036845
|
|
|
6cb7994 |
---
|
|
|
6cb7994 |
src/core/job.c | 11 +++++++----
|
|
|
6cb7994 |
src/core/job.h | 3 ++-
|
|
|
6cb7994 |
src/core/unit.c | 5 ++++-
|
|
|
6cb7994 |
3 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
6cb7994 |
|
|
|
6cb7994 |
diff --git a/src/core/job.c b/src/core/job.c
|
|
|
6cb7994 |
index d304a16..74ced49 100644
|
|
|
6cb7994 |
--- a/src/core/job.c
|
|
|
6cb7994 |
+++ b/src/core/job.c
|
|
|
6cb7994 |
@@ -528,7 +528,7 @@ int job_run_and_invalidate(Job *j) {
|
|
|
6cb7994 |
else if (t == UNIT_ACTIVATING)
|
|
|
6cb7994 |
r = -EAGAIN;
|
|
|
6cb7994 |
else
|
|
|
6cb7994 |
- r = -ENOEXEC;
|
|
|
6cb7994 |
+ r = -EBADR;
|
|
|
6cb7994 |
break;
|
|
|
6cb7994 |
}
|
|
|
6cb7994 |
|
|
|
6cb7994 |
@@ -557,8 +557,10 @@ int job_run_and_invalidate(Job *j) {
|
|
|
6cb7994 |
if (j) {
|
|
|
6cb7994 |
if (r == -EALREADY)
|
|
|
6cb7994 |
r = job_finish_and_invalidate(j, JOB_DONE, true);
|
|
|
6cb7994 |
- else if (r == -ENOEXEC)
|
|
|
6cb7994 |
+ else if (r == -EBADR)
|
|
|
6cb7994 |
r = job_finish_and_invalidate(j, JOB_SKIPPED, true);
|
|
|
6cb7994 |
+ else if (r == -ENOEXEC)
|
|
|
6cb7994 |
+ r = job_finish_and_invalidate(j, JOB_INVALID, true);
|
|
|
6cb7994 |
else if (r == -EAGAIN) {
|
|
|
6cb7994 |
j->state = JOB_WAITING;
|
|
|
6cb7994 |
m->n_running_jobs--;
|
|
|
6cb7994 |
@@ -784,7 +786,7 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) {
|
|
|
6cb7994 |
goto finish;
|
|
|
6cb7994 |
}
|
|
|
6cb7994 |
|
|
|
6cb7994 |
- if (result == JOB_FAILED)
|
|
|
6cb7994 |
+ if (result == JOB_FAILED || result == JOB_INVALID)
|
|
|
6cb7994 |
j->manager->n_failed_jobs ++;
|
|
|
6cb7994 |
|
|
|
6cb7994 |
job_uninstall(j);
|
|
|
6cb7994 |
@@ -1137,7 +1139,8 @@ static const char* const job_result_table[_JOB_RESULT_MAX] = {
|
|
|
6cb7994 |
[JOB_TIMEOUT] = "timeout",
|
|
|
6cb7994 |
[JOB_FAILED] = "failed",
|
|
|
6cb7994 |
[JOB_DEPENDENCY] = "dependency",
|
|
|
6cb7994 |
- [JOB_SKIPPED] = "skipped"
|
|
|
6cb7994 |
+ [JOB_SKIPPED] = "skipped",
|
|
|
6cb7994 |
+ [JOB_INVALID] = "invalid",
|
|
|
6cb7994 |
};
|
|
|
6cb7994 |
|
|
|
6cb7994 |
DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult);
|
|
|
6cb7994 |
diff --git a/src/core/job.h b/src/core/job.h
|
|
|
6cb7994 |
index d90bc96..4237529 100644
|
|
|
6cb7994 |
--- a/src/core/job.h
|
|
|
6cb7994 |
+++ b/src/core/job.h
|
|
|
6cb7994 |
@@ -97,7 +97,8 @@ enum JobResult {
|
|
|
6cb7994 |
JOB_TIMEOUT, /* JobTimeout elapsed */
|
|
|
6cb7994 |
JOB_FAILED, /* Job failed */
|
|
|
6cb7994 |
JOB_DEPENDENCY, /* A required dependency job did not result in JOB_DONE */
|
|
|
6cb7994 |
- JOB_SKIPPED, /* JOB_RELOAD of inactive unit; negative result of JOB_VERIFY_ACTIVE */
|
|
|
6cb7994 |
+ JOB_SKIPPED, /* Negative result of JOB_VERIFY_ACTIVE */
|
|
|
6cb7994 |
+ JOB_INVALID, /* JOB_RELOAD of inactive unit */
|
|
|
6cb7994 |
_JOB_RESULT_MAX,
|
|
|
6cb7994 |
_JOB_RESULT_INVALID = -1
|
|
|
6cb7994 |
};
|
|
|
6cb7994 |
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
|
6cb7994 |
index e744cd3..cdeceae 100644
|
|
|
6cb7994 |
--- a/src/core/unit.c
|
|
|
6cb7994 |
+++ b/src/core/unit.c
|
|
|
6cb7994 |
@@ -1163,8 +1163,11 @@ int unit_reload(Unit *u) {
|
|
|
6cb7994 |
if (state == UNIT_RELOADING)
|
|
|
6cb7994 |
return -EALREADY;
|
|
|
6cb7994 |
|
|
|
6cb7994 |
- if (state != UNIT_ACTIVE)
|
|
|
6cb7994 |
+ if (state != UNIT_ACTIVE) {
|
|
|
6cb7994 |
+ log_warning_unit(u->id, "Unit %s cannot be reloaded because it is inactive.",
|
|
|
6cb7994 |
+ u->id);
|
|
|
6cb7994 |
return -ENOEXEC;
|
|
|
6cb7994 |
+ }
|
|
|
6cb7994 |
|
|
|
6cb7994 |
if ((following = unit_following(u))) {
|
|
|
6cb7994 |
log_debug_unit(u->id, "Redirecting reload request from %s to %s.",
|