virtcontainers: fix delete sandbox failed problem

flyflypeng · flyflypeng · commit 22d482320020 · 2020-08-12T00:28:47.000+08:00
fixes: #2882 reason: If error happens after container create and before sandbox updateResouce in the `CreateContainer()`, then delete sandbox forcefully will return error because s.config.Containers config not flushed into persist store. Signed-off-by: jiangpengfei <jiangpengfei9@huawei.com>
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
@@ -1164,6 +1164,10 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro
 			if len(s.config.Containers) > 0 {
 				// delete container config
 				s.config.Containers = s.config.Containers[:len(s.config.Containers)-1]
+				// need to flush change to persist storage
+				if newErr := s.storeSandbox(); newErr != nil {
+					s.Logger().WithError(newErr).Error("Fail to flush s.config.Containers change into sandbox store")
+				}
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -1164,6 +1164,10 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro`
`1164`	`1164`	`if len(s.config.Containers) > 0 {`
`1165`	`1165`	`// delete container config`
`1166`	`1166`	`s.config.Containers = s.config.Containers[:len(s.config.Containers)-1]`
	`1167`	`+ // need to flush change to persist storage`
	`1168`	`+ if newErr := s.storeSandbox(); newErr != nil {`
	`1169`	`+ s.Logger().WithError(newErr).Error("Fail to flush s.config.Containers change into sandbox store")`
	`1170`	`+ }`
`1167`	`1171`	`}`
`1168`	`1172`	`}`
`1169`	`1173`	`}()`