agent: clean up proxy process if start sandbox failed

Otherwise we'll leave kata-proxy process dangling around forever. Fixes: #759 Signed-off-by: Peng Tao <[email protected]>
kata-containers · Sep 21, 2018 · 0ddf99d · 0ddf99d
1 parent 35d3c0b
commit 0ddf99d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -569,6 +569,12 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
 		return err
 	}
 
+	defer func() {
+		if err != nil {
+			k.proxy.stop(k.state.ProxyPid)
+		}
+	}()
+
 	hostname := sandbox.config.Hostname
 	if len(hostname) > maxHostnameLen {
 		hostname = hostname[:maxHostnameLen]
@@ -586,10 +592,10 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
 	if err != nil {
 		return err
 	}
-	if err := k.updateInterfaces(interfaces); err != nil {
+	if err = k.updateInterfaces(interfaces); err != nil {
 		return err
 	}
-	if _, err := k.updateRoutes(routes); err != nil {
+	if _, err = k.updateRoutes(routes); err != nil {
 		return err
 	}