github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-19 07:49:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5899 from Bevisy/fix-outdated-comments

Browse Source 
shim: return hypervisor's pid not shim's pid
This commit is contained in:
Peng Tao
2022-12-15 14:55:54 +08:00
committed by GitHub
parent 7210905deb 99485d871c
commit ebb73df6bc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/pkg/containerd-shim-v2/service.go
View File

@@ -825,7 +825,7 @@ func (s *service) Kill(ctx context.Context, r *taskAPI.KillRequest) (_ *ptypes.E
// Pids returns all pids inside the container
// Since for kata, it cannot get the process's pid from VM,
// thus only return the Shim's pid directly.
// thus only return the hypervisor's pid directly.
func (s *service) Pids(ctx context.Context, r *taskAPI.PidsRequest) (_ *taskAPI.PidsResponse, err error) {
shimLog.WithField("container", r.ID).Debug("Pids() start")
defer shimLog.WithField("container", r.ID).Debug("Pids() end")
@@ -927,7 +927,7 @@ func (s *service) Connect(ctx context.Context, r *taskAPI.ConnectRequest) (_ *ta
return &taskAPI.ConnectResponse{
ShimPid: s.pid,
//Since kata cannot get the container's pid in VM, thus only return the shim's pid.
//Since kata cannot get the container's pid in VM, thus only return the hypervisor's pid.
TaskPid: s.hpid,
}, nil
}