core: introduce new stop protocol for unit scopes
By specifiy a Controller property when creating the scope a client can specify a bus name that will be notified with a RequestStop bus signal when the scope has been asked to shut down, instead of sending SIGTERM to the scope processes themselves. https://bugzilla.redhat.com/show_bug.cgi?id=1032695
This commit is contained in:
+19
-7
@@ -64,6 +64,8 @@ static void scope_done(Unit *u) {
|
||||
|
||||
cgroup_context_done(&s->cgroup_context);
|
||||
|
||||
free(s->controller);
|
||||
|
||||
set_free(s->pids);
|
||||
s->pids = NULL;
|
||||
|
||||
@@ -217,6 +219,7 @@ static void scope_enter_dead(Scope *s, ScopeResult f) {
|
||||
}
|
||||
|
||||
static void scope_enter_signal(Scope *s, ScopeState state, ScopeResult f) {
|
||||
bool skip_signal = false;
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
@@ -224,13 +227,22 @@ static void scope_enter_signal(Scope *s, ScopeState state, ScopeResult f) {
|
||||
if (f != SCOPE_SUCCESS)
|
||||
s->result = f;
|
||||
|
||||
r = unit_kill_context(
|
||||
UNIT(s),
|
||||
&s->kill_context,
|
||||
state != SCOPE_STOP_SIGTERM,
|
||||
-1, -1, false);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
/* If we have a controller set let's ask the controller nicely
|
||||
* to terminate the scope, instead of us going directly into
|
||||
* SIGTERM beserk mode */
|
||||
if (state == SCOPE_STOP_SIGTERM)
|
||||
skip_signal = bus_scope_send_request_stop(s) > 0;
|
||||
|
||||
if (!skip_signal) {
|
||||
r = unit_kill_context(
|
||||
UNIT(s),
|
||||
&s->kill_context,
|
||||
state != SCOPE_STOP_SIGTERM,
|
||||
-1, -1, false);
|
||||
if (r < 0)
|
||||
goto fail;
|
||||
} else
|
||||
r = 1;
|
||||
|
||||
if (r > 0) {
|
||||
r = scope_arm_timer(s);
|
||||
|
||||
Reference in New Issue
Block a user