Remove deferred flag when removing devmapper device

mxpv · mxpv · commit 3741fd859116 · 2019-07-31T11:28:33.000-07:00
Signed-off-by: Maksym Pavlenko &lt;makpav@amazon.com&gt;
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ func (p *PoolDevice) RemoveDevice(ctx context.Context, deviceName string) error`
`364`	`364`	`return errors.Wrapf(err, "can't query metadata for device %q", deviceName)`
`365`	`365`	`}`
`366`	`366`
`367`		`- if err := p.DeactivateDevice(ctx, deviceName, true, true); err != nil {`
	`367`	`+ if err := p.DeactivateDevice(ctx, deviceName, false, true); err != nil {`
`368`	`368`	`return err`
`369`	`369`	`}`
`370`	`370`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,6 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot`
`501`	`501`	`if err != nil {`
`502`	`502`	`t.Fatal(err)`
`503`	`503`	`}`
`504`		`- defer testutil.Unmount(t, base)`
`505`	`504`
`506`	`505`	`committedBase := filepath.Join(work, "committed-base")`
`507`	`506`	`if err = snapshotter.Commit(ctx, committedBase, base, opt); err != nil {`
`@@ -540,6 +539,7 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot`
`540`	`539`	`if err != nil {`
`541`	`540`	`t.Fatal(err)`
`542`	`541`	`}`
	`542`	`+ testutil.Unmount(t, base)`
`543`	`543`	`err = snapshotter.Remove(ctx, committedBase)`
`544`	`544`	`if err != nil {`
`545`	`545`	`t.Fatal(err)`