diff --git a/kata-containers.spec b/kata-containers.spec index 8ec5fee73770aa6a342e35b0c0abe112daa4fc87..4bb706c66cbbcd2f7bc8b15bfeacb2c01dbc65cd 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 2.1.0 -%define RELEASE 5 +%define RELEASE 6 Name: kata-containers Version: %{VERSION} @@ -108,6 +108,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Fri Oct 5 2021 jikui - 2.1.0-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix kata-runtime hungs when qemu process is D/T + * Mon Sep 27 2021 yangfeiyu - 2.1.0-5 - Type:enhancement - ID:NA diff --git a/patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch b/patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch new file mode 100644 index 0000000000000000000000000000000000000000..d8464f917f6807d7f72e8b6e8f12726c91991a22 --- /dev/null +++ b/patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch @@ -0,0 +1,27 @@ +From c563b455e3bb0cebfbe2a77c8d5ebac36aac3c76 Mon Sep 17 00:00:00 2001 +From: jikui +Date: Thu, 4 Nov 2021 19:58:33 +0800 +Subject: [PATCH 1/8] kata-runtime: fix kata-runtime hungs when qemu process is + D/T state + +Signed-off-by: jikui +--- + src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go b/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go +index 97e9245..325250d 100644 +--- a/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go ++++ b/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go +@@ -717,6 +717,8 @@ func QMPStart(ctx context.Context, socket string, cfg QMPConfig, disconnectedCh + if q.version == nil { + return nil, nil, fmt.Errorf("failed to find QMP version information") + } ++ case <-time.After(15 * time.Second): ++ return nil, nil, fmt.Errorf("qmp start time out") + } + + return q, q.version, nil +-- +2.25.1 + diff --git a/series.conf b/series.conf index 482704e636160f4421c9d2b1b59a2369bff4f5b4..9ba5e56faed6461cdf10a329fdf3eec4f98594f0 100644 --- a/series.conf +++ b/series.conf @@ -6,3 +6,4 @@ 0006-factory-add-the-template-factory-support-for-hypervi.patch 0007-kata-containers-support-with-iSulad.patch 0008-kata-containers-adpat-with-iSulad.patch +0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch