github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove deferred flag when removing devmapper device

Browse Source 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
This commit is contained in:
Maksym Pavlenko 2019-07-31 11:28:33 -07:00
parent 4d5a0e19eb
commit 3741fd8591
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snapshots/devmapper/pool_device.go
View File

@ -364,7 +364,7 @@ func (p *PoolDevice) RemoveDevice(ctx context.Context, deviceName string) error
return errors.Wrapf(err, "can't query metadata for device %q", deviceName) return errors.Wrapf(err, "can't query metadata for device %q", deviceName)
} }
if err := p.DeactivateDevice(ctx, deviceName, true, true); err != nil { if err := p.DeactivateDevice(ctx, deviceName, false, true); err != nil {
return err return err
} }

2
snapshots/testsuite/testsuite.go
View File

@ -501,7 +501,6 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer testutil.Unmount(t, base)
committedBase := filepath.Join(work, "committed-base") committedBase := filepath.Join(work, "committed-base")
if err = snapshotter.Commit(ctx, committedBase, base, opt); err != nil { if err = snapshotter.Commit(ctx, committedBase, base, opt); err != nil {
@ -540,6 +539,7 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
testutil.Unmount(t, base)
err = snapshotter.Remove(ctx, committedBase) err = snapshotter.Remove(ctx, committedBase)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)