RepoMirrors/go-ceph
1
0
Fork 0
mirror of https://github.com/ceph/go-ceph synced 2025-01-11 16:49:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: use conventional naming style for errors

Browse Source 
A recent PR added new error values that were similar to the existing
naming convention but were not the normal go convention. Change all the
errors to match typical convention but leave the older names as aliases
such that older code will continue to work (for now).

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2019-12-12 12:25:42 -05:00 committed by Niels de Vos
parent a2d1c64180
commit 36fc3510d8
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rbd/rbd.go
View File

@ -61,11 +61,15 @@ const (
type RBDError int
var (
RbdErrorNoIOContext = errors.New("RBD image does not have an IOContext")
RbdErrorNoName = errors.New("RBD image does not have a name")
RbdErrorSnapshotNoName = errors.New("RBD snapshot does not have a name")
RbdErrorImageNotOpen = errors.New("RBD image not open")
RbdErrorNotFound = errors.New("RBD image not found")
ErrNoIOContext = errors.New("RBD image does not have an IOContext")
ErrNoName = errors.New("RBD image does not have a name")
ErrSnapshotNoName = errors.New("RBD snapshot does not have a name")
ErrImageNotOpen = errors.New("RBD image not open")
ErrNotFound = errors.New("RBD image not found")
// retained for compatibility with old versions
RbdErrorImageNotOpen = ErrImageNotOpen
RbdErrorNotFound = ErrNotFound
)
//
@ -141,11 +145,11 @@ func hasBit(value, bit uint32) bool {
// case the attribute is not set
func (image *Image) validate(req uint32) error {
if hasBit(req, imageNeedsName) && image.name == "" {
return RbdErrorNoName
return ErrNoName
} else if hasBit(req, imageNeedsIOContext) && image.ioctx == nil {
return RbdErrorNoIOContext
return ErrNoIOContext
} else if hasBit(req, imageIsOpen) && image.image == nil {
return RbdErrorImageNotOpen
return ErrImageNotOpen
}
return nil
@ -156,7 +160,7 @@ func (image *Image) validate(req uint32) error {
// Calls snapshot.image.validate(req) to validate the image attributes.
func (snapshot *Snapshot) validate(req uint32) error {
if hasBit(req, snapshotNeedsName) && snapshot.name == "" {
return RbdErrorSnapshotNoName
return ErrSnapshotNoName
} else if snapshot.image != nil {
return snapshot.image.validate(req)
}
@ -185,7 +189,7 @@ func (e RBDError) Error() string {
func GetError(err C.int) error {
if err != 0 {
if err == -C.ENOENT {
return RbdErrorNotFound
return ErrNotFound
}
return RBDError(err)
} else {

30
rbd/rbd_test.go
View File

@ -414,35 +414,35 @@ func TestNoIOContext(t *testing.T) {
image := rbd.GetImage(nil, "nonexistent")
_, err := image.Clone("new snapshot", nil, "clone", 0, 0)
assert.Equal(t, err, rbd.RbdErrorNoIOContext)
assert.Equal(t, err, rbd.ErrNoIOContext)
err = image.Remove()
assert.Equal(t, err, rbd.RbdErrorNoIOContext)
assert.Equal(t, err, rbd.ErrNoIOContext)
err = image.Trash(15 * time.Second)
assert.Equal(t, err, rbd.RbdErrorNoIOContext)
assert.Equal(t, err, rbd.ErrNoIOContext)
err = image.Rename("unknown")
assert.Equal(t, err, rbd.RbdErrorNoIOContext)
assert.Equal(t, err, rbd.ErrNoIOContext)
err = image.Open()
assert.Equal(t, err, rbd.RbdErrorNoIOContext)
assert.Equal(t, err, rbd.ErrNoIOContext)
}
func TestErrorNoName(t *testing.T) {
image := rbd.GetImage(nil, "")
err := image.Remove()
assert.Equal(t, err, rbd.RbdErrorNoName)
assert.Equal(t, err, rbd.ErrNoName)
err = image.Trash(15 * time.Second)
assert.Equal(t, err, rbd.RbdErrorNoName)
assert.Equal(t, err, rbd.ErrNoName)
err = image.Rename("unknown")
assert.Equal(t, err, rbd.RbdErrorNoName)
assert.Equal(t, err, rbd.ErrNoName)
err = image.Open()
assert.Equal(t, err, rbd.RbdErrorNoName)
assert.Equal(t, err, rbd.ErrNoName)
}
func TestErrorImageNotOpen(t *testing.T) {
@ -562,22 +562,22 @@ func TestErrorSnapshotNoName(t *testing.T) {
assert.NoError(t, err)
err = snapshot.Remove()
assert.Equal(t, err, rbd.RbdErrorSnapshotNoName)
assert.Equal(t, err, rbd.ErrSnapshotNoName)
err = snapshot.Rollback()
assert.Equal(t, err, rbd.RbdErrorSnapshotNoName)
assert.Equal(t, err, rbd.ErrSnapshotNoName)
err = snapshot.Protect()
assert.Equal(t, err, rbd.RbdErrorSnapshotNoName)
assert.Equal(t, err, rbd.ErrSnapshotNoName)
err = snapshot.Unprotect()
assert.Equal(t, err, rbd.RbdErrorSnapshotNoName)
assert.Equal(t, err, rbd.ErrSnapshotNoName)
_, err = snapshot.IsProtected()
assert.Equal(t, err, rbd.RbdErrorSnapshotNoName)
assert.Equal(t, err, rbd.ErrSnapshotNoName)
err = snapshot.Set()
assert.Equal(t, err, rbd.RbdErrorSnapshotNoName)
assert.Equal(t, err, rbd.ErrSnapshotNoName)
// image can not be removed as the snapshot still exists
// err = img.Remove()