vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #512 from runcom/stop-timeout

Browse source 
server: honor container stop timeout from CRI
This commit is contained in:
Antonio Murdaca 2017-05-16 10:06:47 +02:00 • committed by GitHub
commit 1ca660e3b7
6 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/crioctl/container.go
View file

@ -148,7 +148,7 @@ var stopContainerCommand = cli.Command{
defer conn.Close()
client := pb.NewRuntimeServiceClient(conn)
err = StopContainer(client, context.String("id"))
err = StopContainer(client, context.String("id"), -1)
if err != nil {
return fmt.Errorf("Stopping the container failed: %v", err)
}
@ -402,12 +402,13 @@ func StartContainer(client pb.RuntimeServiceClient, ID string) error {
// StopContainer sends a StopContainerRequest to the server, and parses
// the returned StopContainerResponse.
func StopContainer(client pb.RuntimeServiceClient, ID string) error {
func StopContainer(client pb.RuntimeServiceClient, ID string, timeout int64) error {
if ID == "" {
return fmt.Errorf("ID cannot be empty")
}
_, err := client.StopContainer(context.Background(), &pb.StopContainerRequest{
ContainerId: ID,
Timeout: timeout,
})
if err != nil {
return err