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

devmapper: more precise way of checking if device is activated

Browse Source 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
This commit is contained in:
Maksym Pavlenko 2019-02-21 15:43:39 -08:00
parent 37cdedc61c
commit 7efda48c53
No known key found for this signature in database
GPG Key ID: BDA48CBFE7A0FC14
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
snapshots/devmapper/pool_device.go
View File

@ -188,9 +188,8 @@ func (p *PoolDevice) CreateSnapshotDevice(ctx context.Context, deviceName string
return errors.Wrapf(err, "failed to query device metadata for %q", deviceName) return errors.Wrapf(err, "failed to query device metadata for %q", deviceName)
} }
isActivated := baseInfo.State == Activated
// Suspend thin device if it was activated previously // Suspend thin device if it was activated previously
isActivated := p.IsActivated(baseInfo.Name)
if isActivated { if isActivated {
if err := p.transition(ctx, baseInfo.Name, Suspending, Suspended, func() error { if err := p.transition(ctx, baseInfo.Name, Suspending, Suspended, func() error {
return dmsetup.SuspendDevice(baseInfo.Name) return dmsetup.SuspendDevice(baseInfo.Name)
@ -245,13 +244,8 @@ func (p *PoolDevice) CreateSnapshotDevice(ctx context.Context, deviceName string
// DeactivateDevice deactivates thin device // DeactivateDevice deactivates thin device
func (p *PoolDevice) DeactivateDevice(ctx context.Context, deviceName string, deferred bool) error { func (p *PoolDevice) DeactivateDevice(ctx context.Context, deviceName string, deferred bool) error {
devicePath := dmsetup.GetFullDevicePath(deviceName) if !p.IsActivated(deviceName) {
if _, err := os.Stat(devicePath); err != nil { return nil
if os.IsNotExist(err) {
return ErrNotFound
}
return err
} }
opts := []dmsetup.RemoveDeviceOpt{dmsetup.RemoveWithForce, dmsetup.RemoveWithRetries} opts := []dmsetup.RemoveDeviceOpt{dmsetup.RemoveWithForce, dmsetup.RemoveWithRetries}
@ -268,6 +262,21 @@ func (p *PoolDevice) DeactivateDevice(ctx context.Context, deviceName string, de
return nil return nil
} }
// IsActivated returns true if thin-device is activated and not suspended
func (p *PoolDevice) IsActivated(deviceName string) bool {
infos, err := dmsetup.Info(deviceName)
if err != nil || len(infos) == 0 {
// Couldn't query device info, device not active
return false
}
if devInfo := infos[0]; devInfo.Suspended {
return false
}
return true
}
// RemoveDevice completely wipes out thin device from thin-pool and frees it's device ID // RemoveDevice completely wipes out thin device from thin-pool and frees it's device ID
func (p *PoolDevice) RemoveDevice(ctx context.Context, deviceName string) error { func (p *PoolDevice) RemoveDevice(ctx context.Context, deviceName string) error {
info, err := p.metadata.GetDevice(ctx, deviceName) info, err := p.metadata.GetDevice(ctx, deviceName)
@ -275,7 +284,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); err != nil && err != ErrNotFound { if err := p.DeactivateDevice(ctx, deviceName, true); err != nil {
return err return err
} }
@ -305,7 +314,7 @@ func (p *PoolDevice) RemovePool(ctx context.Context) error {
// Deactivate devices if any // Deactivate devices if any
for _, name := range deviceNames { for _, name := range deviceNames {
if err := p.DeactivateDevice(ctx, name, true); err != nil && err != ErrNotFound { if err := p.DeactivateDevice(ctx, name, true); err != nil {
result = multierror.Append(result, errors.Wrapf(err, "failed to remove %q", name)) result = multierror.Append(result, errors.Wrapf(err, "failed to remove %q", name))
} }
} }

7
snapshots/devmapper/pool_device_test.go
View File

@ -191,12 +191,13 @@ func testDeactivateThinDevice(t *testing.T, pool *PoolDevice) {
} }
for _, deviceName := range deviceList { for _, deviceName := range deviceList {
assert.Assert(t, pool.IsActivated(deviceName))
err := pool.DeactivateDevice(context.Background(), deviceName, false) err := pool.DeactivateDevice(context.Background(), deviceName, false)
assert.NilError(t, err, "failed to remove '%s'", deviceName) assert.NilError(t, err, "failed to remove '%s'", deviceName)
}
err := pool.DeactivateDevice(context.Background(), "not-existing-device", false) assert.Assert(t, !pool.IsActivated(deviceName))
assert.Assert(t, err != nil, "should return an error if trying to remove not existing device") }
} }
func testRemoveThinDevice(t *testing.T, pool *PoolDevice) { func testRemoveThinDevice(t *testing.T, pool *PoolDevice) {