Skip to content

Commit 5fd168e

Browse files
committed
Merge remote-tracking branch 'origin/pr/16' into main
2 parents 4f12a0e + 5d3a346 commit 5fd168e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

containerd/shim.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,5 +844,10 @@ func (s *service) Stats(ctx context.Context, req *task.StatsRequest) (*task.Stat
844844

845845
func (s *service) Connect(ctx context.Context, req *task.ConnectRequest) (*task.ConnectResponse, error) {
846846
log.G(ctx).WithField("req", req).Warn("CONNECT")
847-
return nil, errdefs.ErrNotImplemented
847+
primaryPid := s.primary.GetPID()
848+
849+
return &taskAPI.ConnectResponse{
850+
ShimPid: uint32(os.Getpid()),
851+
TaskPid: uint32(primaryPid),
852+
}, nil
848853
}

0 commit comments

Comments
 (0)