decommission: do sanity check for pod.sandpox pointer

lifupan · lifupan · commit 53bf0023bf3b · 2018-07-11T11:35:29.000+08:00
Signed-off-by: fupan &lt;lifupan@gmail.com&gt;
diff --git a/daemon/pod/decommission.go b/daemon/pod/decommission.go
@@ -611,13 +611,14 @@ func (p *XPod) decommissionResources() (err error) {
 		}
 	}
 
-	err = p.sandbox.Delete()
-	if err != nil {
-		p.Log(ERROR, "remove sandbox failed: %v", err)
+	if p.sandbox != nil {
+		err = p.sandbox.Delete()
+		if err != nil {
+			p.Log(ERROR, "remove sandbox failed: %v", err)
+		}
+		p.sandbox = nil
 	}
 
-	p.sandbox = nil
-
 	cleanupHosts(p.Id())
 	// then it could be start again.
 	p.factory.hosts = HostsCreator(p.Id())

Original file line number	Diff line number	Diff line change
`@@ -611,13 +611,14 @@ func (p *XPod) decommissionResources() (err error) {`
`611`	`611`	`}`
`612`	`612`	`}`
`613`	`613`
`614`		`- err = p.sandbox.Delete()`
`615`		`- if err != nil {`
`616`		`- p.Log(ERROR, "remove sandbox failed: %v", err)`
	`614`	`+ if p.sandbox != nil {`
	`615`	`+ err = p.sandbox.Delete()`
	`616`	`+ if err != nil {`
	`617`	`+ p.Log(ERROR, "remove sandbox failed: %v", err)`
	`618`	`+ }`
	`619`	`+ p.sandbox = nil`
`617`	`620`	`}`
`618`	`621`
`619`		`- p.sandbox = nil`
`620`		`-`
`621`	`622`	`cleanupHosts(p.Id())`
`622`	`623`	`// then it could be start again.`
`623`	`624`	`p.factory.hosts = HostsCreator(p.Id())`