fix #29199, reset container if container start failed

Signed-off-by: Lei Jitang <leijitang@huawei.com> Upstream-commit: e806821b53f9ca1f1a3d933e7bbfe04a5566a3bf Component: engine
2016-12-07 01:37:08 -05:00
parent af8b72cda0
commit b1cf7fa923
1 changed files with 3 additions and 2 deletions
@@ -119,6 +119,9 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
 				container.SetExitCode(128)
 			}
 			container.ToDisk()
+
+			container.Reset(false)
+
 			daemon.Cleanup(container)
 			// if containers AutoRemove flag is set, remove it after clean up
 			if container.HostConfig.AutoRemove {
@@ -187,8 +190,6 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
 			container.SetExitCode(127)
 		}

-		container.Reset(false)
-
 		return fmt.Errorf("%s", errDesc)
 	}