diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-12-22 21:21:09 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-12-22 22:17:58 +0100 |
| commit | 57cb4adf4ed61ab9eeb7f190f94d700a56bafad0 (patch) | |
| tree | a2082f8fe28a5c4e4cbab2d40ef717ca3f6d3c67 | |
| parent | socket: support socket activation of containers (diff) | |
| download | systemd-57cb4adf4ed61ab9eeb7f190f94d700a56bafad0.tar.xz systemd-57cb4adf4ed61ab9eeb7f190f94d700a56bafad0.zip | |
nspawn: try to orderly shutdown container when receiving SIGTERM
| -rw-r--r-- | src/core/manager.c | 3 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 17 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index ac11ce1806..a3839e1538 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1176,7 +1176,8 @@ static int manager_process_signal_fd(Manager *m) { assert(m); for (;;) { - if ((n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) { + n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi)); + if (n != sizeof(sfsi)) { if (n >= 0) return -EIO; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index f5fb59d2d4..1f3bda5b4a 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -817,13 +817,18 @@ static int is_os_tree(const char *path) { return r < 0 ? 0 : 1; } -static int process_pty(int master, sigset_t *mask) { +static int process_pty(int master, pid_t pid, sigset_t *mask) { char in_buffer[LINE_MAX], out_buffer[LINE_MAX]; size_t in_buffer_full = 0, out_buffer_full = 0; struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev; bool stdin_readable = false, stdout_writable = false, master_readable = false, master_writable = false; int ep = -1, signal_fd = -1, r; + bool tried_orderly_shutdown = false; + + assert(master >= 0); + assert(pid > 0); + assert(mask); fd_nonblock(STDIN_FILENO, 1); fd_nonblock(STDOUT_FILENO, 1); @@ -940,6 +945,14 @@ static int process_pty(int master, sigset_t *mask) { /* The window size changed, let's forward that. */ if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0) ioctl(master, TIOCSWINSZ, &ws); + } else if (sfsi.ssi_signo == SIGTERM && arg_boot && !tried_orderly_shutdown) { + + log_info("Trying to halt container. Send SIGTERM again to trigger immediate termination."); + + /* This only works for systemd... */ + tried_orderly_shutdown = true; + kill(pid, SIGRTMIN+3); + } else { r = 0; goto finish; @@ -1451,7 +1464,7 @@ int main(int argc, char *argv[]) { fdset_free(fds); fds = NULL; - if (process_pty(master, &mask) < 0) + if (process_pty(master, pid, &mask) < 0) goto finish; if (saved_attr_valid) |