github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 13:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2231 from liubin/fix/2230-register-defer-callback-at-early-stage

Browse Source 
runtime: Register defer function at early stage
This commit is contained in:
Fabiano Fidêncio
2021-07-14 17:50:48 +02:00
committed by GitHub
parent 2f573bceaf 39546a1070
commit 3a9ecbcca5
2 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/runtime/virtcontainers/sandbox.go
View File

@@ -1012,6 +1012,12 @@ func (s *Sandbox) startVM(ctx context.Context) (err error) {
s.cw = consoleWatcher
}
defer func() {
if err != nil {
s.hypervisor.stopSandbox(ctx, false)
}
}()
if err := s.network.Run(ctx, s.networkNS.NetNsPath, func() error {
if s.factory != nil {
vm, err := s.factory.GetVM(ctx, VMConfig{
@@ -1031,12 +1037,6 @@ func (s *Sandbox) startVM(ctx context.Context) (err error) {
return err
}
defer func() {
if err != nil {
s.hypervisor.stopSandbox(ctx, false)
}
}()
// In case of vm factory, network interfaces are hotplugged
// after vm is started.
if s.factory != nil {
@@ -1553,18 +1553,7 @@ func (s *Sandbox) Stop(ctx context.Context, force bool) error {
return nil
}
// list lists all sandbox running on the host.
func (s *Sandbox) list() ([]Sandbox, error) {
return nil, nil
}
// enter runs an executable within a sandbox.
func (s *Sandbox) enter(args []string) error {
return nil
}
// setSandboxState sets both the in-memory and on-disk state of the
// sandbox.
// setSandboxState sets the in-memory state of the sandbox.
func (s *Sandbox) setSandboxState(state types.StateString) error {
if state == "" {
return vcTypes.ErrNeedState

15
src/runtime/virtcontainers/sandbox_test.go
View File

@@ -181,21 +181,6 @@ func TestCreateSandboxEmptyID(t *testing.T) {
defer cleanUp()
}
func TestSandboxListSuccessful(t *testing.T) {
sandbox := &Sandbox{}
sandboxList, err := sandbox.list()
assert.NoError(t, err)
assert.Nil(t, sandboxList)
}
func TestSandboxEnterSuccessful(t *testing.T) {
sandbox := &Sandbox{}
err := sandbox.enter([]string{})
assert.NoError(t, err)
}
func testCheckInitSandboxAndContainerStates(p *Sandbox, initialSandboxState types.SandboxState, c *Container, initialContainerState types.ContainerState) error {
if p.state.State != initialSandboxState.State {
return fmt.Errorf("Expected sandbox state %v, got %v", initialSandboxState.State, p.state.State)