cleanup the sandbox after it exited

lifupan · lifupan · commit 57d713a365d9 · 2018-06-22T12:42:12.000+08:00
Signed-off-by: fupan &lt;lifupan@gmail.com&gt;
diff --git a/daemon/pod/decommission.go b/daemon/pod/decommission.go
@@ -49,10 +49,11 @@ func (p *XPod) ForceQuit() {
 }
 
 func (p *XPod) Remove(force bool) error {
+	var err error
 
 	if p.IsRunning() {
 		if !force {
-			err := fmt.Errorf("pod is running, cannot be removed")
+			err = fmt.Errorf("pod is running, cannot be removed")
 			p.Log(ERROR, err)
 			return err
 		}
@@ -624,6 +625,11 @@ func (p *XPod) decommissionResources() (err error) {
 		}
 	}
 
+	err = p.sandbox.Delete()
+	if err != nil {
+		p.Log(ERROR, "remove sandbox failed: %v", err)
+	}
+
 	p.sandbox = nil
 
 	cleanupHosts(p.Id())

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,11 @@ func (p *XPod) ForceQuit() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func (p *XPod) Remove(force bool) error {`
	`52`	`+ var err error`
`52`	`53`
`53`	`54`	`if p.IsRunning() {`
`54`	`55`	`if !force {`
`55`		`- err := fmt.Errorf("pod is running, cannot be removed")`
	`56`	`+ err = fmt.Errorf("pod is running, cannot be removed")`
`56`	`57`	`p.Log(ERROR, err)`
`57`	`58`	`return err`
`58`	`59`	`}`
`@@ -624,6 +625,11 @@ func (p *XPod) decommissionResources() (err error) {`
`624`	`625`	`}`
`625`	`626`	`}`
`626`	`627`
	`628`	`+ err = p.sandbox.Delete()`
	`629`	`+ if err != nil {`
	`630`	`+ p.Log(ERROR, "remove sandbox failed: %v", err)`
	`631`	`+ }`
	`632`	`+`
`627`	`633`	`p.sandbox = nil`
`628`	`634`
`629`	`635`	`cleanupHosts(p.Id())`