dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-06-30 19:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13483 from AkihiroSuda/fix-lima-5030

Browse Source 
runc-shim: don't hold the service lock across runc create
This commit is contained in:
Akihiro Suda
2026-06-01 16:48:13 +00:00
committed by GitHub
parent 561fcdbd8b dbcaa504c6
commit c8802b6e7b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/containerd-shim-runc-v2/task/service.go
View File

@@ -221,9 +221,6 @@ func (s *service) preStart(c *runc.Container) (handleStarted func(*runc.Containe
// Create a new initial process and container with the underlying OCI runtime
func (s *service) Create(ctx context.Context, r *taskAPI.CreateTaskRequest) (_ *taskAPI.CreateTaskResponse, err error) {
s.mu.Lock()
defer s.mu.Unlock()
s.lifecycleMu.Lock()
handleStarted, cleanup := s.preStart(nil)
s.lifecycleMu.Unlock()
@@ -234,7 +231,9 @@ func (s *service) Create(ctx context.Context, r *taskAPI.CreateTaskRequest) (_ *
return nil, err
}
s.mu.Lock()
s.containers[r.ID] = container
s.mu.Unlock()
s.send(&eventstypes.TaskCreate{
ContainerID: r.ID,