27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
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
|
|
|