containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6228 from vieux/fix_restart_links 

Fix restart links
This commit is contained in:
Tibor Vass 2014-06-05 17:54:27 -07:00
parent 98d44ac491 30ba7546cb
commit c06f32a7b9
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
daemon/daemon.go
View File

@ -147,11 +147,11 @@ func (daemon *Daemon) load(id string) (*Container, error) {
// Register makes a container object usable by the daemon as <container.ID> // Register makes a container object usable by the daemon as <container.ID>
// This is a wrapper for register // This is a wrapper for register
func (daemon *Daemon) Register(container *Container) error { func (daemon *Daemon) Register(container *Container) error {
return daemon.register(container, true) return daemon.register(container, true, nil)
} }
// register makes a container object usable by the daemon as <container.ID> // register makes a container object usable by the daemon as <container.ID>
func (daemon *Daemon) register(container *Container, updateSuffixarray bool) error { func (daemon *Daemon) register(container *Container, updateSuffixarray bool, containersToStart *[]*Container) error {
if container.daemon != nil || daemon.Exists(container.ID) { if container.daemon != nil || daemon.Exists(container.ID) {
return fmt.Errorf("Container is already loaded") return fmt.Errorf("Container is already loaded")
} }
@ -220,13 +220,13 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
if !info.IsRunning() { if !info.IsRunning() {
utils.Debugf("Container %s was supposed to be running but is not.", container.ID) utils.Debugf("Container %s was supposed to be running but is not.", container.ID)
if daemon.config.AutoRestart { if daemon.config.AutoRestart {
utils.Debugf("Restarting") utils.Debugf("Marking as restarting")
if err := container.Unmount(); err != nil { if err := container.Unmount(); err != nil {
utils.Debugf("restart unmount error %s", err) utils.Debugf("restart unmount error %s", err)
} }
if err := container.Start(); err != nil { if containersToStart != nil {
return err *containersToStart = append(*containersToStart, container)
} }
} else { } else {
utils.Debugf("Marking as stopped") utils.Debugf("Marking as stopped")
@ -311,7 +311,12 @@ func (daemon *Daemon) Destroy(container *Container) error {
} }
func (daemon *Daemon) restore() error { func (daemon *Daemon) restore() error {
debug := (os.Getenv("DEBUG") != "" || os.Getenv("TEST") != "") var (
debug = (os.Getenv("DEBUG") != "" || os.Getenv("TEST") != "")
containers = make(map[string]*Container)
currentDriver = daemon.driver.String()
containersToStart = []*Container{}
)
if !debug { if !debug {
fmt.Printf("Loading containers: ") fmt.Printf("Loading containers: ")
@ -320,8 +325,6 @@ func (daemon *Daemon) restore() error {
if err != nil { if err != nil {
return err return err
} }
containers := make(map[string]*Container)
currentDriver := daemon.driver.String()
for _, v := range dir { for _, v := range dir {
id := v.Name() id := v.Name()
@ -350,7 +353,7 @@ func (daemon *Daemon) restore() error {
} }
e := entities[p] e := entities[p]
if container, ok := containers[e.ID()]; ok { if container, ok := containers[e.ID()]; ok {
if err := daemon.register(container, false); err != nil { if err := daemon.register(container, false, &containersToStart); err != nil {
utils.Debugf("Failed to register container %s: %s", container.ID, err) utils.Debugf("Failed to register container %s: %s", container.ID, err)
} }
delete(containers, e.ID()) delete(containers, e.ID())
@ -365,12 +368,20 @@ func (daemon *Daemon) restore() error {
if err != nil { if err != nil {
utils.Debugf("Setting default id - %s", err) utils.Debugf("Setting default id - %s", err)
} }
if err := daemon.register(container, false); err != nil { if err := daemon.register(container, false, &containersToStart); err != nil {
utils.Debugf("Failed to register container %s: %s", container.ID, err) utils.Debugf("Failed to register container %s: %s", container.ID, err)
} }
} }
daemon.idIndex.UpdateSuffixarray() daemon.idIndex.UpdateSuffixarray()
for _, container := range containersToStart {
utils.Debugf("Starting container %d", container.ID)
if err := container.Start(); err != nil {
utils.Debugf("Failed to start container %s: %s", container.ID, err)
}
}
if !debug { if !debug {
fmt.Printf(": done.\n") fmt.Printf(": done.\n")
} }

1
daemon/execdriver/native/driver.go
View File

@ -187,6 +187,7 @@ func (d *driver) Terminate(p *execdriver.Command) error {
} }
if started == currentStartTime { if started == currentStartTime {
err = syscall.Kill(p.Process.Pid, 9) err = syscall.Kill(p.Process.Pid, 9)
syscall.Wait4(p.Process.Pid, nil, 0, nil)
} }
d.removeContainerRoot(p.ID) d.removeContainerRoot(p.ID)
return err return err