github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-07 19:14:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1998 from lifupan/fix_wrongresources

Browse Source 
Fix the issue of update resources wrong
This commit is contained in:
Peng Tao 2019-08-23 10:11:49 +08:00 committed by GitHub
commit 346d96ce4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
virtcontainers/sandbox.go
View File

@ -1116,6 +1116,13 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro
// Update sandbox config. // Update sandbox config.
s.config.Containers = append(s.config.Containers, contConfig) s.config.Containers = append(s.config.Containers, contConfig)
defer func() {
if err != nil && len(s.config.Containers) > 0 {
// delete container config
s.config.Containers = s.config.Containers[:len(s.config.Containers)-1]
}
}()
// Sandbox is reponsable to update VM resources needed by Containers // Sandbox is reponsable to update VM resources needed by Containers
err = s.updateResources() err = s.updateResources()
if err != nil { if err != nil {
@ -1128,7 +1135,7 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro
} }
// Add the container to the containers list in the sandbox. // Add the container to the containers list in the sandbox.
if err := s.addContainer(c); err != nil { if err = s.addContainer(c); err != nil {
return nil, err return nil, err
} }
@ -1138,11 +1145,7 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro
return nil, err return nil, err
} }
if err := s.store.Store(store.Configuration, *(s.config)); err != nil { if err = s.updateCgroups(); err != nil {
return nil, err
}
if err := s.updateCgroups(); err != nil {
return nil, err return nil, err
} }
@ -1242,11 +1245,6 @@ func (s *Sandbox) DeleteContainer(containerID string) (VCContainer, error) {
} }
} }
// Store sandbox config
if err := s.store.Store(store.Configuration, *(s.config)); err != nil {
return nil, err
}
if err = s.storeSandbox(); err != nil { if err = s.storeSandbox(); err != nil {
return nil, err return nil, err
} }

6
virtcontainers/sandbox_test.go
View File

@ -909,6 +909,12 @@ func TestCreateContainer(t *testing.T) {
contConfig := newTestContainerConfigNoop(contID) contConfig := newTestContainerConfigNoop(contID)
_, err = s.CreateContainer(contConfig) _, err = s.CreateContainer(contConfig)
assert.Nil(t, err, "Failed to create container %+v in sandbox %+v: %v", contConfig, s, err) assert.Nil(t, err, "Failed to create container %+v in sandbox %+v: %v", contConfig, s, err)
assert.Equal(t, len(s.config.Containers), 1, "Container config list length from sandbox structure should be 1")
_, err = s.CreateContainer(contConfig)
assert.NotNil(t, err, "Should failed to create a duplicated container")
assert.Equal(t, len(s.config.Containers), 1, "Container config list length from sandbox structure should be 1")
} }
func TestDeleteContainer(t *testing.T) { func TestDeleteContainer(t *testing.T) {