kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #6771 from LK4D4/fix_containers_list_race

Browse source 
Add synchronization in server.Containers
This commit is contained in:
Victor Vieux 2014-07-03 17:53:50 -07:00
commit 44d737707c
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
server/server.go
View file

@ -24,6 +24,7 @@ package server
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -957,22 +958,25 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
} }
} }
for _, container := range srv.daemon.List() { errLast := errors.New("last container")
writeCont := func(container *daemon.Container) error {
container.Lock()
defer container.Unlock()
if !container.State.IsRunning() && !all && n <= 0 && since == "" && before == "" { if !container.State.IsRunning() && !all && n <= 0 && since == "" && before == "" {
continue return nil
} }
if before != "" && !foundBefore { if before != "" && !foundBefore {
if container.ID == beforeCont.ID { if container.ID == beforeCont.ID {
foundBefore = true foundBefore = true
} }
continue return nil
} }
if n > 0 && displayed == n { if n > 0 && displayed == n {
break return errLast
} }
if since != "" { if since != "" {
if container.ID == sinceCont.ID { if container.ID == sinceCont.ID {
break return errLast
} }
} }
displayed++ displayed++
@ -999,7 +1003,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
out.Set("Status", container.State.String()) out.Set("Status", container.State.String())
str, err := container.NetworkSettings.PortMappingAPI().ToListString() str, err := container.NetworkSettings.PortMappingAPI().ToListString()
if err != nil { if err != nil {
return job.Error(err) return err
} }
out.Set("Ports", str) out.Set("Ports", str)
if size { if size {
@ -1008,6 +1012,16 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
out.SetInt64("SizeRootFs", sizeRootFs) out.SetInt64("SizeRootFs", sizeRootFs)
} }
outs.Add(out) outs.Add(out)
return nil
}
for _, container := range srv.daemon.List() {
if err := writeCont(container); err != nil {
if err != errLast {
return job.Error(err)
}
break
}
} }
outs.ReverseSort() outs.ReverseSort()
if _, err := outs.WriteListTo(job.Stdout); err != nil { if _, err := outs.WriteListTo(job.Stdout); err != nil {