diff options
| author | CoprDistGit <infra@openeuler.org> | 2025-05-30 08:24:45 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2025-05-30 08:24:45 +0000 |
| commit | 7df887ee174b7802d30c6e0bda4d763274df91f3 (patch) | |
| tree | a1735112507017c38f2b08d0aee4c136c2307c3f /0194-modify-the-CreateContainer-failed-return.patch | |
| parent | 664ca34f01a2f1c50e94ba70a97ad21cce6e72c2 (diff) | |
automatic import of iSuladopeneuler24.03_LTS_SP1
Diffstat (limited to '0194-modify-the-CreateContainer-failed-return.patch')
| -rw-r--r-- | 0194-modify-the-CreateContainer-failed-return.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0194-modify-the-CreateContainer-failed-return.patch b/0194-modify-the-CreateContainer-failed-return.patch new file mode 100644 index 0000000..d8caa45 --- /dev/null +++ b/0194-modify-the-CreateContainer-failed-return.patch @@ -0,0 +1,26 @@ +From b2bf7c101852a90fba3f7e85734fa887e3cd5fad Mon Sep 17 00:00:00 2001 +From: zhongtao <zhongtao17@huawei.com> +Date: Fri, 14 Feb 2025 15:23:21 +1400 +Subject: [PATCH 194/198] modify the CreateContainer failed return + +Signed-off-by: zhongtao <zhongtao17@huawei.com> +--- + src/daemon/entry/cri/v1/v1_cri_container_manager_service.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/entry/cri/v1/v1_cri_container_manager_service.cc b/src/daemon/entry/cri/v1/v1_cri_container_manager_service.cc +index abf60c0c..fe1cca0c 100644 +--- a/src/daemon/entry/cri/v1/v1_cri_container_manager_service.cc ++++ b/src/daemon/entry/cri/v1/v1_cri_container_manager_service.cc +@@ -486,7 +486,7 @@ std::string ContainerManagerService::CreateContainer(const std::string &podSandb + // verify whether the sandbox is ready + if (!sandbox->IsReady()) { + error.Errorf("Failed to generate sandbox_info because the sandbox %s is not ready", sandbox->GetId().c_str()); +- return nullptr; ++ return response_id; + } + + #ifdef ENABLE_NRI +-- +2.34.1 + |