github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-12 21:27:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1151 from sboeuf/fix_v2_shutdown

Browse Source 
runtime-v2: Make sure Shutdown() only shuts the server down
This commit is contained in:
Sebastien Boeuf 2019-01-18 01:32:43 -08:00 committed by GitHub
commit 45f72219f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
containerd-shim-v2/service.go
View File

@ -386,6 +386,22 @@ func (s *service) Delete(ctx context.Context, r *taskAPI.DeleteRequest) (*taskAP
return nil, err return nil, err
} }
// Take care of the use case where it is a sandbox.
// Right after the container representing the sandbox has
// been deleted, let's make sure we stop and delete the
// sandbox.
if c.cType.IsSandbox() {
if err = s.sandbox.Stop(); err != nil {
logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to stop sandbox")
return nil, err
}
if err = s.sandbox.Delete(); err != nil {
logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to delete sandbox")
return nil, err
}
}
return &taskAPI.DeleteResponse{ return &taskAPI.DeleteResponse{
ExitStatus: c.exit, ExitStatus: c.exit,
ExitedAt: c.time, ExitedAt: c.time,
@ -654,26 +670,17 @@ func (s *service) Connect(ctx context.Context, r *taskAPI.ConnectRequest) (*task
func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*ptypes.Empty, error) { func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*ptypes.Empty, error) {
s.Lock() s.Lock()
defer s.Unlock()
if len(s.containers) != 0 { if len(s.containers) != 0 {
s.Unlock()
return empty, nil return empty, nil
} }
s.Unlock()
defer os.Exit(0) os.Exit(0)
err := s.sandbox.Stop() // This will never be called, but this is only there to make sure the
if err != nil { // program can compile.
logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to stop sandbox") return empty, nil
return empty, err
}
err = s.sandbox.Delete()
if err != nil {
logrus.WithField("sandbox", s.sandbox.ID()).Error("failed to delete sandbox")
}
return empty, err
} }
func (s *service) Stats(ctx context.Context, r *taskAPI.StatsRequest) (*taskAPI.StatsResponse, error) { func (s *service) Stats(ctx context.Context, r *taskAPI.StatsRequest) (*taskAPI.StatsResponse, error) {