virtcontainers: add rollback to remove sandbox network

If error occurs after sandbox network created successfully, we need to rollback to remove the created sandbox network Fixes: #297 Signed-off-by: flyflypeng <[email protected]> Signed-off-by: Eric Ernst <[email protected]>
kata-containers · Aug 23, 2018 · 3bbcdbc · 3bbcdbc
1 parent 85b1627
commit 3bbcdbc
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/virtcontainers/api.go b/virtcontainers/api.go
@@ -39,19 +39,28 @@ func CreateSandbox(sandboxConfig SandboxConfig) (VCSandbox, error) {
 }
 
 func createSandboxFromConfig(sandboxConfig SandboxConfig) (*Sandbox, error) {
+	var err error
+
 	// Create the sandbox.
 	s, err := createSandbox(sandboxConfig)
 	if err != nil {
 		return nil, err
 	}
 
 	// Create the sandbox network
-	if err := s.createNetwork(); err != nil {
+	if err = s.createNetwork(); err != nil {
 		return nil, err
 	}
 
+	// network rollback
+	defer func() {
+		if err != nil && s.networkNS.NetNsCreated {
+			s.removeNetwork()
+		}
+	}()
+
 	// Start the VM
-	if err := s.startVM(); err != nil {
+	if err = s.startVM(); err != nil {
 		return nil, err
 	}
 
@@ -77,12 +86,12 @@ func createSandboxFromConfig(sandboxConfig SandboxConfig) (*Sandbox, error) {
 	}()
 
 	// Create Containers
-	if err := s.createContainers(); err != nil {
+	if err = s.createContainers(); err != nil {
 		return nil, err
 	}
 
 	// The sandbox is completely created now, we can store it.
-	if err := s.storeSandbox(); err != nil {
+	if err = s.storeSandbox(); err != nil {
 		return nil, err
 	}