1. docker
  2. Commit 947405a90951e4715a8399410b67f4f644415d59
Browse code

Do inspect under container lock

It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)

LK4D4 authored on 2014/06/15 02:08:23
Showing 1 changed files
daemon/inspect.go
History View file @ 947405a
... ... 
@@ -13,11 +13,13 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {
13 13 
 	}
14 14 
 	name := job.Args[0]
15 15 
 	if container := daemon.Get(name); container != nil {
16 
+		container.Lock()
17 
+		defer container.Unlock()
16 18 
 		if job.GetenvBool("dirty") {
17 19 
 			b, err := json.Marshal(&struct {
18 20 
 				*Container
19 21 
 				HostConfig *runconfig.HostConfig
20 
-			}{container, container.HostConfig()})
22 
+			}{container, container.hostConfig})
21 23 
 			if err != nil {
22 24 
 				return job.Error(err)
23 25 
 			}