113 lines
3.5 KiB
Diff
113 lines
3.5 KiB
Diff
From ef7c687828efd488369ff860523aa15a42c72587 Mon Sep 17 00:00:00 2001
|
|
From: wujing <wujing50@huawei.com>
|
|
Date: Mon, 13 Apr 2020 04:58:46 -0400
|
|
Subject: [PATCH 06/49] modify container exit code and stop signal
|
|
|
|
Signed-off-by: wujing <wujing50@huawei.com>
|
|
---
|
|
src/lxc/lxccontainer.c | 10 ++++++++--
|
|
src/lxc/start.c | 28 ++++++++++++++++++++++++++++
|
|
2 files changed, 36 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
|
|
index f4462fd..a617172 100644
|
|
--- a/src/lxc/lxccontainer.c
|
|
+++ b/src/lxc/lxccontainer.c
|
|
@@ -2101,7 +2101,12 @@ WRAP_API_1(bool, lxcapi_reboot2, int)
|
|
static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
|
|
{
|
|
__do_close int pidfd = -EBADF, state_client_fd = -EBADF;
|
|
+#ifdef HAVE_ISULAD
|
|
+ // isulad: keep default signal the same as docker
|
|
+ int haltsignal = SIGTERM;
|
|
+#else
|
|
int haltsignal = SIGPWR;
|
|
+#endif
|
|
pid_t pid = -1;
|
|
lxc_state_t states[MAX_STATE] = {0};
|
|
int killret, ret;
|
|
@@ -2117,12 +2122,13 @@ static bool do_lxcapi_shutdown(struct lxc_container *c, int timeout)
|
|
if (pid <= 0)
|
|
return true;
|
|
|
|
- /* Detect whether we should send SIGRTMIN + 3 (e.g. systemd). */
|
|
if (c->lxc_conf && c->lxc_conf->haltsignal)
|
|
haltsignal = c->lxc_conf->haltsignal;
|
|
+#ifndef HAVE_ISULAD
|
|
+ /* Detect whether we should send SIGRTMIN + 3 (e.g. systemd). */
|
|
else if (task_blocks_signal(pid, (SIGRTMIN + 3)))
|
|
haltsignal = (SIGRTMIN + 3);
|
|
-
|
|
+#endif
|
|
|
|
/*
|
|
* Add a new state client before sending the shutdown signal so
|
|
diff --git a/src/lxc/start.c b/src/lxc/start.c
|
|
index a25bd04..5dcf828 100644
|
|
--- a/src/lxc/start.c
|
|
+++ b/src/lxc/start.c
|
|
@@ -1886,10 +1886,18 @@ out_sync_fini:
|
|
return -1;
|
|
}
|
|
|
|
+#ifdef HAVE_ISULAD
|
|
+// isulad: send '128 + signal' if container is killed by signal.
|
|
+#define EXIT_SIGNAL_OFFSET 128
|
|
+#endif
|
|
+
|
|
int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
|
|
void *data, const char *lxcpath, bool daemonize, int *error_num)
|
|
{
|
|
int ret, status;
|
|
+#ifdef HAVE_ISULAD
|
|
+ int exit_code;
|
|
+#endif
|
|
const char *name = handler->name;
|
|
struct lxc_conf *conf = handler->conf;
|
|
struct cgroup_ops *cgroup_ops;
|
|
@@ -1976,6 +1984,21 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
|
|
* reboot. This should mean it was an lxc-execute which simply exited.
|
|
* In any case, treat it as a 'halt'.
|
|
*/
|
|
+#ifdef HAVE_ISULAD
|
|
+ // isulad: recored log for container init exit
|
|
+ if (WIFSIGNALED(status)) {
|
|
+ int signal = WTERMSIG(status);
|
|
+ signal = WTERMSIG(status);
|
|
+ exit_code = EXIT_SIGNAL_OFFSET + signal;
|
|
+ ERROR("Container \"%s\" init exited with signal %d", name, signal);
|
|
+ } else if (WIFEXITED(status)) {
|
|
+ exit_code = WEXITSTATUS(status);
|
|
+ ERROR("Container \"%s\" init exited with status %d", name, exit_code);
|
|
+ } else {
|
|
+ exit_code = -1;
|
|
+ ERROR("Container \"%s\" init exited with unknown status", name);
|
|
+ }
|
|
+#else
|
|
if (WIFSIGNALED(status)) {
|
|
switch(WTERMSIG(status)) {
|
|
case SIGINT: /* halt */
|
|
@@ -1993,6 +2016,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
|
|
break;
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
ret = lxc_restore_phys_nics_to_netns(handler);
|
|
if (ret < 0)
|
|
@@ -2000,7 +2024,11 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
|
|
|
|
close_prot_errno_disarm(handler->pinfd);
|
|
|
|
+#ifdef HAVE_ISULAD
|
|
+ lxc_monitor_send_exit_code(name, exit_code, handler->lxcpath);
|
|
+#else
|
|
lxc_monitor_send_exit_code(name, status, handler->lxcpath);
|
|
+#endif
|
|
lxc_error_set_and_log(handler->pid, status);
|
|
if (error_num)
|
|
*error_num = handler->exit_status;
|
|
--
|
|
1.8.3.1
|
|
|