40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 4f2951681dbe583e80af91d808292aad8cceb599 Mon Sep 17 00:00:00 2001
|
|
From: haozi007 <liuhao27@huawei.com>
|
|
Date: Thu, 28 Jan 2021 14:04:54 +0800
|
|
Subject: [PATCH 17/26] ignore error if get ip failed
|
|
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
|
---
|
|
.../entry/cri/cri_pod_sandbox_manager_service_impl.cc | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/daemon/entry/cri/cri_pod_sandbox_manager_service_impl.cc b/src/daemon/entry/cri/cri_pod_sandbox_manager_service_impl.cc
|
|
index 27768852..a668d60b 100644
|
|
--- a/src/daemon/entry/cri/cri_pod_sandbox_manager_service_impl.cc
|
|
+++ b/src/daemon/entry/cri/cri_pod_sandbox_manager_service_impl.cc
|
|
@@ -989,12 +989,12 @@ void PodSandboxManagerServiceImpl::GetIPs(const std::string &podSandboxID, const
|
|
}
|
|
|
|
if (inspect->network_settings != nullptr && inspect->network_settings->ip_address != nullptr) {
|
|
- WARN("Use container inspect ip info: %s", error.GetCMessage());
|
|
- error.Clear();
|
|
+ WARN("Use container inspect ip info");
|
|
ips.push_back(inspect->network_settings->ip_address);
|
|
}
|
|
|
|
WARN("Failed to read pod IP from plugin/docker: %s", error.GetCMessage());
|
|
+ error.Clear();
|
|
}
|
|
|
|
void PodSandboxManagerServiceImpl::SetSandboxStatusNetwork(const container_inspect *inspect,
|
|
@@ -1214,4 +1214,4 @@ void PodSandboxManagerServiceImpl::PortForward(const runtime::v1alpha2::PortForw
|
|
// This feature is temporarily not supported
|
|
}
|
|
|
|
-} // namespace CRI
|
|
\ No newline at end of file
|
|
+} // namespace CRI
|
|
--
|
|
2.25.1
|
|
|