From d87076eea592a79557b55f08b062415ebda45fa2 Mon Sep 17 00:00:00 2001 From: bin Date: Tue, 9 Mar 2021 17:41:44 +0800 Subject: [PATCH] runtime: return hypervisor Pid in TaskExit event Other RPC calls return Pid of hypervisor, the TaskExit should return the same Pid. Fixes: #1497 Signed-off-by: bin (backport https://github.com/kata-containers/kata-containers/pull/1498) Signed-off-by: Francesco Giudici [ fix missing GetHypervisorPid method in MockSandbox ] Signed-off-by: Peng Tao --- src/runtime/containerd-shim-v2/utils.go | 2 +- src/runtime/virtcontainers/pkg/vcmock/sandbox.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/runtime/containerd-shim-v2/utils.go b/src/runtime/containerd-shim-v2/utils.go index 95adb93faa..4618a4981e 100644 --- a/src/runtime/containerd-shim-v2/utils.go +++ b/src/runtime/containerd-shim-v2/utils.go @@ -24,7 +24,7 @@ import ( func cReap(s *service, status int, id, execid string, exitat time.Time) { s.ec <- exit{ timestamp: exitat, - pid: s.pid, + pid: s.hpid, status: status, id: id, execid: execid, diff --git a/src/runtime/virtcontainers/pkg/vcmock/sandbox.go b/src/runtime/virtcontainers/pkg/vcmock/sandbox.go index 727fed7af8..95ae2afe44 100644 --- a/src/runtime/virtcontainers/pkg/vcmock/sandbox.go +++ b/src/runtime/virtcontainers/pkg/vcmock/sandbox.go @@ -254,3 +254,7 @@ func (s *Sandbox) GetAgentURL() (string, error) { } return "", nil } + +func (s *Sandbox) GetHypervisorPid() (int, error) { + return 0, nil +}