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)
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 1002cdb399b19ec2d82e4254e48f8096be6119f0 Mon Sep 17 00:00:00 2001
|
|
From: jiangpengfei <jiangpengfei9@huawei.com>
|
|
Date: Sat, 19 Dec 2020 13:15:12 -0500
|
|
Subject: [PATCH] kata-runtime: force delete the sandbox and container
|
|
|
|
reason: force delete the container and sandbox when container
|
|
or sandbox state is not running.
|
|
|
|
Conflict: NA
|
|
Reference:https://gitee.com/src-openeuler/kata-runtime
|
|
Change-Id: Iaccf6c2f1de2712e88307259bed305cd366a90b7
|
|
Signed-off-by: jiangpengfei <jiangpengfei9@huawei.com>
|
|
---
|
|
cli/delete.go | 12 +++---------
|
|
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/cli/delete.go b/cli/delete.go
|
|
index 09552b9..1e6dfa5 100644
|
|
--- a/cli/delete.go
|
|
+++ b/cli/delete.go
|
|
@@ -117,20 +117,14 @@ func delete(ctx context.Context, containerID string, force bool) error {
|
|
return err
|
|
}
|
|
|
|
- forceStop := false
|
|
if oci.StateToOCIState(status.State.State) == oci.StateRunning {
|
|
if !force {
|
|
return fmt.Errorf("Container still running, should be stopped")
|
|
}
|
|
-
|
|
- forceStop = true
|
|
}
|
|
|
|
- if oci.StateToOCIState(status.State.State) == oci.StateUnhealthy {
|
|
- // Set forceStop and force bool flag to true to force delete everything
|
|
- forceStop = true
|
|
- force = true
|
|
- }
|
|
+ // no matter what delete parameter is, just set force to remove the container and sandbox
|
|
+ force = true
|
|
|
|
switch containerType {
|
|
case vc.PodSandbox:
|
|
@@ -138,7 +132,7 @@ func delete(ctx context.Context, containerID string, force bool) error {
|
|
return err
|
|
}
|
|
case vc.PodContainer:
|
|
- if err := deleteContainer(ctx, sandboxID, containerID, forceStop); err != nil {
|
|
+ if err := deleteContainer(ctx, sandboxID, containerID, force); err != nil {
|
|
// If err info containers "no such file or directory, because pod_sandbox type
|
|
// container is deleted before pod_container type container, just return nil
|
|
// and let containerd delete container operations continue
|
|
--
|
|
1.8.3.1
|
|
|