You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
112 lines
6.3 KiB
112 lines
6.3 KiB
4 years ago
|
From 5f0bb278dfe913bd2c7dcbc9f457892f5e8aca9d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jouke Witteveen <j.witteveen@gmail.com>
|
||
|
|
Date: Tue, 6 Dec 2016 13:30:28 +0100
|
||
|
|
Subject: [PATCH] service: go through stop_post on failure (#4770)
|
||
|
|
|
||
|
|
(cherry picked from commit c3fda31da36706b045f5de800d6a77e65e7a8ec9)
|
||
|
|
|
||
|
|
Resolves: #1733998
|
||
|
|
---
|
||
|
|
src/core/service.c | 24 +++++++++++-------------
|
||
|
|
1 file changed, 11 insertions(+), 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
||
|
|
index b6f302ec33..e538280bad 100644
|
||
|
|
--- a/src/core/service.c
|
||
|
|
+++ b/src/core/service.c
|
||
|
|
@@ -1532,7 +1532,7 @@ static void service_enter_running(Service *s, ServiceResult f) {
|
||
|
|
service_set_state(s, SERVICE_RUNNING);
|
||
|
|
|
||
|
|
} else if (f != SERVICE_SUCCESS)
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
|
||
|
|
else if (s->remain_after_exit)
|
||
|
|
service_set_state(s, SERVICE_EXITED);
|
||
|
|
else
|
||
|
|
@@ -1671,7 +1671,7 @@ static void service_enter_start(Service *s) {
|
||
|
|
|
||
|
|
fail:
|
||
|
|
log_unit_warning_errno(UNIT(s)->id, r, "%s failed to run 'start' task: %m", UNIT(s)->id);
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void service_enter_start_pre(Service *s) {
|
||
|
|
@@ -1823,9 +1823,7 @@ static void service_run_next_control(Service *s) {
|
||
|
|
fail:
|
||
|
|
log_unit_warning_errno(UNIT(s)->id, r, "%s failed to run next control task: %m", UNIT(s)->id);
|
||
|
|
|
||
|
|
- if (s->state == SERVICE_START_PRE)
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
||
|
|
- else if (s->state == SERVICE_STOP)
|
||
|
|
+ if (IN_SET(s->state, SERVICE_START_PRE, SERVICE_STOP))
|
||
|
|
service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
||
|
|
else if (s->state == SERVICE_STOP_POST)
|
||
|
|
service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
|
||
|
|
@@ -2572,7 +2570,7 @@ static void service_notify_cgroup_empty_event(Unit *u) {
|
||
|
|
|
||
|
|
service_unwatch_pid_file(s);
|
||
|
|
if (s->state == SERVICE_START)
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
+ service_enter_stop_post(s, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
else
|
||
|
|
service_enter_stop(s, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
}
|
||
|
|
@@ -2701,17 +2699,17 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
|
||
|
|
if (f == SERVICE_SUCCESS)
|
||
|
|
service_enter_start_post(s);
|
||
|
|
else
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
|
||
|
|
break;
|
||
|
|
} else if (s->type == SERVICE_NOTIFY) {
|
||
|
|
/* Only enter running through a notification, so that the
|
||
|
|
* SERVICE_START state signifies that no ready notification
|
||
|
|
* has been received */
|
||
|
|
if (f != SERVICE_SUCCESS)
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
|
||
|
|
else if (!s->remain_after_exit)
|
||
|
|
/* The service has never been active */
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2792,7 +2790,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
|
||
|
|
if (f == SERVICE_SUCCESS)
|
||
|
|
service_enter_start(s);
|
||
|
|
else
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
|
||
|
|
break;
|
||
|
|
|
||
|
|
case SERVICE_START:
|
||
|
|
@@ -2801,7 +2799,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
|
||
|
|
break;
|
||
|
|
|
||
|
|
if (f != SERVICE_SUCCESS) {
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2818,7 +2816,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
|
||
|
|
if (!has_start_post && r < 0) {
|
||
|
|
r = service_demand_pid_file(s);
|
||
|
|
if (r < 0 || !cgroup_good(s))
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
} else
|
||
|
|
@@ -2914,7 +2912,7 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
|
||
|
|
case SERVICE_START_PRE:
|
||
|
|
case SERVICE_START:
|
||
|
|
log_unit_warning(UNIT(s)->id, "%s %s operation timed out. Terminating.", UNIT(s)->id, s->state == SERVICE_START ? "start" : "start-pre");
|
||
|
|
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_TIMEOUT);
|
||
|
|
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
|
||
|
|
break;
|
||
|
|
|
||
|
|
case SERVICE_START_POST:
|