vc: Restore sandbox state when there is error starting containers

Fixes #2237 Signed-off-by: Ted Yu <[email protected]>
kata-containers · Nov 21, 2019 · 93a0336 · 93a0336
1 parent 1f71114
commit 93a0336
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
@@ -1523,13 +1523,21 @@ func (s *Sandbox) Start() error {
 		return err
 	}
 
+	prevState := s.state.State
+
 	if err := s.setSandboxState(types.StateRunning); err != nil {
 		return err
 	}
 
+	var startErr error
+	defer func() {
+		if startErr != nil {
+			s.setSandboxState(prevState)
+		}
+	}()
 	for _, c := range s.containers {
-		if err := c.start(); err != nil {
-			return err
+		if startErr = c.start(); startErr != nil {
+			return startErr
 		}
 	}