Skip to content
This repository was archived by the owner on Mar 30, 2020. It is now read-only.

Change killContainer to stopContainer and wait for graceful shutdown #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change killContainer to stopContainer and wait for graceful shutdown #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c3b03
Change killContainer to stopContainer and wait for graceful shutdown
filiptc Oct 23, 2015
d0902a6
Add errors on graceful shutdown failure in given time
filiptc Oct 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions core/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
)

const LatestTag = "latest"
const GracefulShutdownTime = 20

type Docker struct {
endPoint string
Expand Down Expand Up @@ -85,11 +86,16 @@ func (d *Docker) cleanContainers(p *Project) error {
for _, c := range l {
if c.IsRunning() {
Debug("Stoping container and image", "project", p, "container", c.GetShortID(), "end-point", d.endPoint)
if err := d.killContainer(c); err != nil {
if err := d.stopContainer(c); err != nil {
return err
}
}

err := d.waitForGracefulShutdown(c)
if err != nil {
Error(err.Error(), "project", p, "container", c.GetShortID())
}

Debug("Removing container", "project", p, "container", c.GetShortID(), "end-point", d.endPoint)
if err := d.removeContainer(c); err != nil {
return err
Expand All @@ -99,9 +105,8 @@ func (d *Docker) cleanContainers(p *Project) error {
return nil
}

func (d *Docker) killContainer(c *Container) error {
kopts := docker.KillContainerOptions{ID: c.ID}
if err := d.client.KillContainer(kopts); err != nil {
func (d *Docker) stopContainer(c *Container) error {
if err := d.client.StopContainer(c.ID, GracefulShutdownTime); err != nil {
return err
}

Expand Down Expand Up @@ -455,15 +460,33 @@ func (d *Docker) restartLinkedContainers(p *Project) error {
return nil
}

func (d *Docker) waitForGracefulShutdown(c * Container) error {
timedOut := 0
isStillRunning := false
for isStillRunning = c.IsRunning(); isStillRunning && timedOut >= GracefulShutdownTime; {
<-time.After(time.Second)
timedOut++
}
if isStillRunning {
return errors.New("Graceful shutdown timed out on container")
}
return nil
}

func (d *Docker) restartContainer(p *Project, c *Container) error {
if !c.IsRunning() {
return nil
}

if err := d.killContainer(c); err != nil {
if err := d.stopContainer(c); err != nil {
return err
}

err := d.waitForGracefulShutdown(c)
if err != nil {
Error(err.Error(), "project", p, "container", c.GetShortID())
}

if err := d.startContainer(p, c); err != nil {
return err
}
Expand Down