virtcontainers: add kata-proxy rollback

If some errors occur after kata-proxy start, we need to rollback to kill kata-proxy process Fixes: clearcontainers#297 Signed-off-by: flyflypeng <[email protected]>
mcastelino · Jul 24, 2018 · c2651a8 · c2651a8
1 parent daebbd1
commit c2651a8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -450,6 +450,8 @@ func (k *kataAgent) generateInterfacesAndRoutes(networkNS NetworkNamespace) ([]*
 }
 
 func (k *kataAgent) startProxy(sandbox *Sandbox) error {
+	var err error
+
 	if k.proxy == nil {
 		return errorMissingProxy
 	}
@@ -475,10 +477,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
 	}