Explorar el Código

daemon: fix GetContainer() returning (nil, nil)

GetContainer() would return (nil, nil) when looking up a container
if the container was inserted into the containersReplica ViewDB but not
the containers Store at the time of the lookup. Callers which reasonably
assume that the returned err == nil implies returned container != nil
would dereference a nil pointer and panic. Change GetContainer() so that
it always returns a container or an error.

Signed-off-by: Cory Snider <csnider@mirantis.com>
Cory Snider hace 2 años
padre
commit
00157a42d3
Se han modificado 1 ficheros con 12 adiciones y 1 borrados
  1. 12 1
      daemon/container.go

+ 12 - 1
daemon/container.go

@@ -56,7 +56,18 @@ func (daemon *Daemon) GetContainer(prefixOrName string) (*container.Container, e
 		}
 		}
 		return nil, errdefs.System(indexError)
 		return nil, errdefs.System(indexError)
 	}
 	}
-	return daemon.containers.Get(containerID), nil
+	ctr := daemon.containers.Get(containerID)
+	if ctr == nil {
+		// Updates to the daemon.containersReplica ViewDB are not atomic
+		// or consistent w.r.t. the live daemon.containers Store so
+		// while reaching this code path may be indicative of a bug,
+		// it is not _necessarily_ the case.
+		logrus.WithField("prefixOrName", prefixOrName).
+			WithField("id", containerID).
+			Debugf("daemon.GetContainer: container is known to daemon.containersReplica but not daemon.containers")
+		return nil, containerNotFound(prefixOrName)
+	}
+	return ctr, nil
 }
 }
 
 
 // checkContainer make sure the specified container validates the specified conditions
 // checkContainer make sure the specified container validates the specified conditions