5ec852595b
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 9c3acba9915c23718ae8a806daa49022a73756eb)
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
From dd36a6031c3f25171d34c9f8cc483af01a4dace1 Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Mon, 20 Mar 2023 14:49:07 +0800
|
|
Subject: [PATCH 31/46] when calling runc start, unset NOTIFY_ SOCKET
|
|
|
|
Signed-off-by: sailorvii <chenw66@chinaunicom.cn>
|
|
---
|
|
src/daemon/modules/runtime/isula/isula_rt_ops.c | 14 ++++++++------
|
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/runtime/isula/isula_rt_ops.c b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
index 4553fa90..e974964a 100644
|
|
--- a/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
+++ b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
@@ -469,6 +469,12 @@ static void runtime_exec_func(void *arg)
|
|
_exit(EXIT_FAILURE);
|
|
}
|
|
|
|
+ // clear NOTIFY_SOCKET from the env to adapt runc start
|
|
+ if (strcmp(rei->subcmd, "start") == 0 && unsetenv("NOTIFY_SOCKET") != 0) {
|
|
+ dprintf(STDERR_FILENO, "unset env NOTIFY_SOCKET failed %s", strerror(errno));
|
|
+ _exit(EXIT_FAILURE);
|
|
+ }
|
|
+
|
|
execvp(rei->cmd, rei->params);
|
|
dprintf(STDERR_FILENO, "exec %s %s %s failed", rei->cmd, rei->subcmd, rei->id);
|
|
_exit(EXIT_FAILURE);
|
|
@@ -941,7 +947,7 @@ int rt_isula_start(const char *id, const char *runtime, const rt_start_params_t
|
|
char shim_pid_file_name[PATH_MAX] = { 0 };
|
|
pid_t pid = 0;
|
|
pid_t shim_pid = -1;
|
|
- int ret = 0;
|
|
+ int ret = -1;
|
|
int splice_ret = 0;
|
|
proc_t *proc = NULL;
|
|
proc_t *p_proc = NULL;
|
|
@@ -963,28 +969,24 @@ int rt_isula_start(const char *id, const char *runtime, const rt_start_params_t
|
|
|
|
pid = get_container_process_pid(workdir);
|
|
if (pid < 0) {
|
|
- ret = -1;
|
|
ERROR("%s: failed wait init pid", id);
|
|
goto out;
|
|
}
|
|
|
|
file_read_int(shim_pid_file_name, &shim_pid);
|
|
if (shim_pid < 0) {
|
|
- ret = -1;
|
|
ERROR("%s: failed to read isulad shim pid", id);
|
|
goto out;
|
|
}
|
|
|
|
proc = util_get_process_proc_info(pid);
|
|
if (proc == NULL) {
|
|
- ret = -1;
|
|
ERROR("%s: failed to read pidinfo", id);
|
|
goto out;
|
|
}
|
|
|
|
p_proc = util_get_process_proc_info(shim_pid);
|
|
if (p_proc == NULL) {
|
|
- ret = -1;
|
|
ERROR("%s: failed to read isulad shim pidinfo", id);
|
|
goto out;
|
|
}
|
|
@@ -996,10 +998,10 @@ int rt_isula_start(const char *id, const char *runtime, const rt_start_params_t
|
|
|
|
if (runtime_call_simple(workdir, runtime, "start", NULL, 0, id, NULL) != 0) {
|
|
ERROR("call runtime start id failed");
|
|
- ret = -1;
|
|
goto out;
|
|
}
|
|
|
|
+ ret = 0;
|
|
out:
|
|
if (ret != 0) {
|
|
show_shim_runtime_errlog(workdir);
|
|
--
|
|
2.25.1
|
|
|