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

Remove unnecessary joinError unwrap

Browse Source 
Signed-off-by: Jin Dong <jin.dong@databricks.com>
This commit is contained in:
Jin Dong 2023-08-21 19:03:41 -07:00
parent cd8c8ae4bc
commit 6d8329d7f5
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
snapshots/devmapper/pool_device.go
View File

@ -209,20 +209,7 @@ func (p *PoolDevice) transition(ctx context.Context, deviceName string, tryingSt
result = append(result, uerr) result = append(result, uerr)
} }
return unwrapError(errors.Join(result...)) return errors.Join(result...)
}
func unwrapError(e error) error {
if e == nil {
return nil
}
if joinErr, ok := e.(interface{ Unwrap() []error }); ok {
if errs := joinErr.Unwrap(); len(errs) == 1 {
return errs[0]
}
}
return e
} }
// CreateThinDevice creates new devmapper thin-device with given name and size. // CreateThinDevice creates new devmapper thin-device with given name and size.

5
snapshots/storage/metastore.go
View File

@ -140,11 +140,6 @@ func (ms *MetaStore) WithTransaction(ctx context.Context, writable bool, fn Tran
if err := errors.Join(result...); err != nil { if err := errors.Join(result...); err != nil {
log.G(ctx).WithError(err).Debug("snapshotter error") log.G(ctx).WithError(err).Debug("snapshotter error")
// Unwrap if just one error
if errs, ok := err.(interface{ Unwrap() []error }); ok && len(errs.Unwrap()) == 1 {
return errs.Unwrap()[0]
}
return err return err
} }