|
@@ -527,13 +527,15 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai
|
|
}
|
|
}
|
|
|
|
|
|
func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr error) {
|
|
func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr error) {
|
|
- start := time.Now()
|
|
|
|
- controller := daemon.netController
|
|
|
|
-
|
|
|
|
if daemon.netController == nil {
|
|
if daemon.netController == nil {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ var (
|
|
|
|
+ start = time.Now()
|
|
|
|
+ controller = daemon.netController
|
|
|
|
+ )
|
|
|
|
+
|
|
// Cleanup any stale sandbox left over due to ungraceful daemon shutdown
|
|
// Cleanup any stale sandbox left over due to ungraceful daemon shutdown
|
|
if err := controller.SandboxDestroy(container.ID); err != nil {
|
|
if err := controller.SandboxDestroy(container.ID); err != nil {
|
|
logrus.Errorf("failed to cleanup up stale network sandbox for container %s", container.ID)
|
|
logrus.Errorf("failed to cleanup up stale network sandbox for container %s", container.ID)
|