From 3741fd859116ae519059b43d674666945c84a638 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Wed, 31 Jul 2019 11:28:33 -0700 Subject: [PATCH] Remove deferred flag when removing devmapper device Signed-off-by: Maksym Pavlenko --- snapshots/devmapper/pool_device.go | 2 +- snapshots/testsuite/testsuite.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go index 68e07af87..22e78c138 100644 --- a/snapshots/devmapper/pool_device.go +++ b/snapshots/devmapper/pool_device.go @@ -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) } - if err := p.DeactivateDevice(ctx, deviceName, true, true); err != nil { + if err := p.DeactivateDevice(ctx, deviceName, false, true); err != nil { return err } diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index 50e0232ed..ee64e30a5 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -501,7 +501,6 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot if err != nil { t.Fatal(err) } - defer testutil.Unmount(t, base) committedBase := filepath.Join(work, "committed-base") 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 { t.Fatal(err) } + testutil.Unmount(t, base) err = snapshotter.Remove(ctx, committedBase) if err != nil { t.Fatal(err)