github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-15 22:53:43 +00:00
Code Issues Projects Releases Wiki Activity

virtcontainers: Fix Store related vm factory leak

Browse Source 
We are creating Store directories but never removing them.
Calling into a VM factory created vm Stop() will now clean the VM Store
artifacts up.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2019-02-06 14:00:01 +01:00
parent 7b0376f3d3
commit bb99e4152b
5 changed files with 77 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtcontainers/factory/cache/cache_test.go vendored
View File

@ -40,7 +40,10 @@ func TestTemplateFactory(t *testing.T) {
assert.Equal(f.Config(), vmConfig)
// GetBaseVM
_, err := f.GetBaseVM(ctx, vmConfig)
vm, err := f.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// CloseFactory

5
virtcontainers/factory/direct/direct_test.go
View File

@ -39,7 +39,10 @@ func TestTemplateFactory(t *testing.T) {
assert.Equal(f.Config(), vmConfig)
// GetBaseVM
_, err := f.GetBaseVM(ctx, vmConfig)
vm, err := f.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// CloseFactory

40
virtcontainers/factory/factory_test.go
View File

@ -190,7 +190,10 @@ func TestFactoryGetVM(t *testing.T) {
f, err := NewFactory(ctx, Config{VMConfig: vmConfig}, false)
assert.Nil(err)
_, err = f.GetVM(ctx, vmConfig)
vm, err := f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
f.CloseFactory(ctx)
@ -199,7 +202,10 @@ func TestFactoryGetVM(t *testing.T) {
f, err = NewFactory(ctx, Config{Template: true, VMConfig: vmConfig}, false)
assert.Nil(err)
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
f.CloseFactory(ctx)
@ -211,7 +217,10 @@ func TestFactoryGetVM(t *testing.T) {
_, err = NewFactory(ctx, Config{Template: true, VMConfig: vmConfig}, true)
assert.Error(err)
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
f.CloseFactory(ctx)
@ -220,7 +229,10 @@ func TestFactoryGetVM(t *testing.T) {
f, err = NewFactory(ctx, Config{Cache: 2, VMConfig: vmConfig}, false)
assert.Nil(err)
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
f.CloseFactory(ctx)
@ -229,22 +241,34 @@ func TestFactoryGetVM(t *testing.T) {
f, err = NewFactory(ctx, Config{Template: true, Cache: 2, VMConfig: vmConfig}, false)
assert.Nil(err)
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// CPU hotplug
vmConfig.HypervisorConfig.NumVCPUs++
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// Memory hotplug
vmConfig.HypervisorConfig.MemorySize += 128
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// checkConfig fall back
vmConfig.HypervisorConfig.Mlock = true
_, err = f.GetVM(ctx, vmConfig)
vm, err = f.GetVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
f.CloseFactory(ctx)

25
virtcontainers/factory/template/template_test.go
View File

@ -46,7 +46,10 @@ func TestTemplateFactory(t *testing.T) {
assert.Equal(f.Config(), vmConfig)
// GetBaseVM
_, err = f.GetBaseVM(ctx, vmConfig)
vm, err := f.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// Fetch
@ -74,19 +77,31 @@ func TestTemplateFactory(t *testing.T) {
assert.Error(err)
templateProxyType = vc.NoopProxyType
_, err = tt.GetBaseVM(ctx, vmConfig)
vm, err = tt.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
_, err = f.GetBaseVM(ctx, vmConfig)
err = vm.Stop()
assert.Nil(err)
vm, err = f.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
err = tt.createTemplateVM(ctx)
assert.Nil(err)
_, err = tt.GetBaseVM(ctx, vmConfig)
vm, err = tt.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
_, err = f.GetBaseVM(ctx, vmConfig)
err = vm.Stop()
assert.Nil(err)
vm, err = f.GetBaseVM(ctx, vmConfig)
assert.Nil(err)
err = vm.Stop()
assert.Nil(err)
// CloseFactory

25
virtcontainers/vm.go
View File

@ -31,6 +31,8 @@ type VM struct {
memory uint32
cpuDelta uint32
store *store.VCStore
}
// VMConfig is a collection of all info that a new blackbox VM needs.
@ -113,12 +115,6 @@ func NewVM(ctx context.Context, config VMConfig) (*VM, error) {
virtLog.WithField("vm", id).WithField("config", config).Info("create new vm")
defer func() {
if err != nil {
virtLog.WithField("vm", id).WithError(err).Error("failed to create new vm")
}
}()
vcStore, err := store.NewVCStore(ctx,
store.SandboxConfigurationRoot(id),
store.SandboxRuntimeRoot(id))
@ -126,6 +122,14 @@ func NewVM(ctx context.Context, config VMConfig) (*VM, error) {
return nil, err
}
defer func() {
if err != nil {
virtLog.WithField("vm", id).WithError(err).Error("failed to create new vm")
virtLog.WithField("vm", id).Errorf("Deleting store for %s", id)
vcStore.Delete()
}
}()
if err = hypervisor.createSandbox(ctx, id, &config.HypervisorConfig, vcStore); err != nil {
return nil, err
}
@ -184,6 +188,7 @@ func NewVM(ctx context.Context, config VMConfig) (*VM, error) {
proxyURL: url,
cpu: config.HypervisorConfig.NumVCPUs,
memory: config.HypervisorConfig.MemorySize,
store: vcStore,
}, nil
}
@ -235,9 +240,13 @@ func (v *VM) Disconnect() error {
// Stop stops a VM process.
func (v *VM) Stop() error {
v.logger().Info("kill vm")
v.logger().Info("stop vm")
return v.hypervisor.stopSandbox()
if err := v.hypervisor.stopSandbox(); err != nil {
return err
}
return v.store.Delete()
}
// AddCPUs adds num of CPUs to the VM.