github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9230 from mxpv/exit

Browse Source 
Exit shim when shutdown manager is done
This commit is contained in:
Akihiro Suda 2023-10-13 14:51:20 +09:00 committed by GitHub
commit 9fcc3beb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/v2/shim/shim.go
View File

@ -379,7 +379,7 @@ func run(ctx context.Context, manager Manager, name string, config Config) error
} }
if err := serve(ctx, server, signals, sd.Shutdown); err != nil { if err := serve(ctx, server, signals, sd.Shutdown); err != nil {
if err != shutdown.ErrShutdown { if !errors.Is(err, shutdown.ErrShutdown) {
return err return err
} }
} }
@ -391,10 +391,10 @@ func run(ctx context.Context, manager Manager, name string, config Config) error
} }
select { select {
case <-publisher.Done(): case <-sd.Done():
return nil return nil
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
return errors.New("publisher not closed") return errors.New("shim shutdown timeout")
} }
} }