5280b56d80
runtime: 0079-kata-runtime-fix-qemu-SCSIBus-info-not-saved-into-pe.patch 0080-kata-runtime-fix-the-block-device-not-removed-in-dev.patch 0081-kata-runtime-cut-too-long-message-in-grpc-log.patch 0082-kata-runtime-change-sandbox-state-to-unhealthy-when-.patch 0083-kata-runtime-add-removeMountBlockDevices-for-contain.patch 0084-kata-runtime-fix-validInterface-func-cause-crash-pro.patch 0085-kata-runtime-fix-kata-netmon-does-not-exit-when-cont.patch 0086-kata-runtime-add-checkCPUSet-before-create-container.patch 0087-kata-runtime-force-delete-the-sandbox-and-container.patch 0088-kata-runtime-check-sandbox-healthy-state-before-call.patch 0089-kata-add-support-for-update-iface.patch 0090-kata-set-sandbox-or-container-status-to-unhealthy.patch 0091-kata-runtime-add-sandbox-file-lock-while-call-GetSan.patch 0092-qemu-add-arm64-to-support-list-of-dimm.patch 0093-kata-runtime-add-timeout-for-grpcWaitProcessRequest.patch 0094-kata-runtime-fix-update-iface-clean-NIC-cause-route-.patch 0095-kata-runtime-fix-qemu-process-resource-resi.patch 0096-kata-containers-Move-from-query-cpus-to-query-cpus-f.patch agent: 0021-kata-agent-fix-sync-clock-not-work-problem.patch 0022-kata-agent-delete-container-id-from-sandbox-struct.patch 0023-kata-agent-modify-log-level.patch 0024-kata-agent-fix-agent.debug_console-not-work-when-bui.patch Signed-off-by: Vanient <xiadanni1@huawei.com> (cherry picked from commit f2d936028666741658157472b8de9d02187c6d55)
61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
From a4776b4a5cfd80d983b26dc8991bdcf1cfb9ad4a Mon Sep 17 00:00:00 2001
|
|
From: jiangpengfei <jiangpengfei9@huawei.com>
|
|
Date: Thu, 10 Dec 2020 18:54:09 -0500
|
|
Subject: [PATCH] kata-runtime: change sandbox state to unhealthy when cmd is
|
|
kill or delete
|
|
|
|
reason: If qemu or kata-proxy process's state is D and execute command
|
|
isn't kill or delete, we should not change sandbox state to unhealthy,
|
|
because D state maybe change to normal soon. So we change the sandbox
|
|
state to unhealthy only when execute command is kill or delete.
|
|
|
|
Conflict: NA
|
|
Reference:https://gitee.com/src-openeuler/kata-containers
|
|
Change-Id: I21ac55aecae9bf83b6f877832c5976698bc9dbf7
|
|
Signed-off-by: jiangpengfei <jiangpengfei9@huawei.com>
|
|
---
|
|
virtcontainers/api.go | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/virtcontainers/api.go b/virtcontainers/api.go
|
|
index 38c8235..0a6ba59 100644
|
|
--- a/virtcontainers/api.go
|
|
+++ b/virtcontainers/api.go
|
|
@@ -1117,16 +1117,6 @@ func CleanupContainer(ctx context.Context, sandboxID, containerID string, force
|
|
// procesUnhealthySandbox only change sandbox state to unhealthy
|
|
// when caller is kata-runtime kill or kata-runtime delete
|
|
func processUnhealthySandbox(sandbox *Sandbox, container *Container) error {
|
|
- // Set all containers state to unhealthy
|
|
- if err := sandbox.setContainersState(types.StateUnhealthy); err != nil {
|
|
- container.Logger().WithError(err).Warn("set all containers state to unhealthy fail")
|
|
- }
|
|
-
|
|
- // Set sandbox state to unhealthy
|
|
- if err := sandbox.setSandboxState(types.StateUnhealthy); err != nil {
|
|
- container.Logger().WithError(err).Warn("set sandbox state to unhealthy fail")
|
|
- }
|
|
-
|
|
forceDelete := false
|
|
|
|
// If process is kata-runtime kill or kata-runtime delete,
|
|
@@ -1138,6 +1128,16 @@ func processUnhealthySandbox(sandbox *Sandbox, container *Container) error {
|
|
}
|
|
|
|
if forceDelete {
|
|
+ // Set all containers state to unhealthy
|
|
+ if err := sandbox.setContainersState(types.StateUnhealthy); err != nil {
|
|
+ container.Logger().WithError(err).Warn("set all containers state to unhealthy fail")
|
|
+ }
|
|
+
|
|
+ // Set sandbox state to unhealthy
|
|
+ if err := sandbox.setSandboxState(types.StateUnhealthy); err != nil {
|
|
+ container.Logger().WithError(err).Warn("set sandbox state to unhealthy fail")
|
|
+ }
|
|
+
|
|
// force stop podSandbox type container's kata-shim process
|
|
if err := stopShim(container.process.Pid); err != nil {
|
|
container.Logger().WithError(err).Warn("fail to stop podSandbox type container kata-shim")
|
|
--
|
|
1.8.3.1
|
|
|