automatic import of iSuladopeneuler24.03_LTS

1 files changed, 29 insertions, 0 deletions

diff --git a/0013-restore-name-for-rename-failed.patch b/0013-restore-name-for-rename-failed.patch
new file mode 100644
index 0000000..be7d59c
--- /dev/null
+++ b/0013-restore-name-for-rename-failed.patch
@@ -0,0 +1,29 @@
+From 2df7a67ad2cb0249b18ca5eba46f9aab8f72038f Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Sun, 18 Feb 2024 11:32:55 +0800
+Subject: [PATCH 13/43] restore name for rename failed
+
+Signed-off-by: zhongtao <zhongtao17@huawei.com>
+---
+ src/daemon/executor/container_cb/execution_information.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/daemon/executor/container_cb/execution_information.c b/src/daemon/executor/container_cb/execution_information.c
+index 2a71e82a..c02cc830 100644
+--- a/src/daemon/executor/container_cb/execution_information.c
++++ b/src/daemon/executor/container_cb/execution_information.c
+@@ -1116,6 +1116,11 @@ static void restore_names_at_fail(container_t *cont, const char *ori_name, const
+     if (!container_name_index_rename(ori_name, new_name, id)) {
+         ERROR("Failed to restore name from \"%s\" to \"%s\" for container %s", new_name, ori_name, id);
+     }
++
++    // restore name in id-name manager
++    if (!id_name_manager_rename(ori_name, new_name)) {
++        ERROR("Failed to restore name from \"%s\" to \"%s\" in id-name manager", new_name, ori_name);
++    }
+ }
+ 
+ static int container_rename(container_t *cont, const char *new_name)
+-- 
+2.34.1
+