vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Fix panic within ctr if the daemon dies while attached to a container (#264)

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickaël Laventure 2016-06-09 14:36:42 -07:00 committed by Michael Crosby
parent a5968ecb85
commit 3d900051b6
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ctr/container.go
View file

@ -22,6 +22,7 @@ import (
netcontext "golang.org/x/net/context" netcontext "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
"google.golang.org/grpc/transport"
) )
// TODO: parse flags and pass opts // TODO: parse flags and pass opts
@ -638,6 +639,10 @@ func waitForExit(c types.APIClient, events types.API_EventsClient, id, pid strin
for { for {
e, err := events.Recv() e, err := events.Recv()
if err != nil { if err != nil {
if grpc.ErrorDesc(err) == transport.ErrConnClosing.Desc {
closer()
os.Exit(128 + int(syscall.SIGHUP))
}
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
events, _ = c.Events(netcontext.Background(), &types.EventsRequest{Timestamp: timestamp}) events, _ = c.Events(netcontext.Background(), &types.EventsRequest{Timestamp: timestamp})
continue continue