virtcontainers: add kata-proxy rollback

If some errors occur after kata-proxy start, we need to rollback to kill kata-proxy process Fixes: #297 Signed-off-by: flyflypeng <[email protected]>
kata-containers · Aug 23, 2018 · bd5c8fe · bd5c8fe
1 parent a4de4e6
commit bd5c8fe
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -421,6 +421,8 @@ func (k *kataAgent) generateInterfacesAndRoutes(networkNS NetworkNamespace) ([]*
 }
 
 func (k *kataAgent) startProxy(sandbox *Sandbox) error {
+	var err error
+
 	if k.proxy == nil {
 		return errorMissingProxy
 	}
@@ -446,10 +448,18 @@ func (k *kataAgent) startProxy(sandbox *Sandbox) error {
 		return err
 	}
 
+	// If error occurs after kata-proxy process start,
+	// then rollback to kill kata-proxy process
+	defer func() {
+		if err != nil && pid > 0 {
+			k.proxy.stop(sandbox, pid)
+		}
+	}()
+
 	// Fill agent state with proxy information, and store them.
 	k.state.ProxyPid = pid
 	k.state.URL = uri
-	if err := sandbox.storage.storeAgentState(sandbox.id, k.state); err != nil {
+	if err = sandbox.storage.storeAgentState(sandbox.id, k.state); err != nil {
 		return err
 	}