RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: use FormatErrorCode for formatting rbd errors 

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2020-08-10 11:04:52 -04:00 committed by John Mulligan
parent b6dff699e4
commit 849fc3c1f3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rbd/errors.go
View File

@ -7,7 +7,6 @@ import "C"
import ( import (
"errors" "errors"
"fmt"
"github.com/ceph/go-ceph/internal/errutil" "github.com/ceph/go-ceph/internal/errutil"
) )
@ -16,11 +15,7 @@ import (
type rbdError int type rbdError int
func (e rbdError) Error() string { func (e rbdError) Error() string {
errno, s := errutil.FormatErrno(int(e)) return errutil.FormatErrorCode("rbd", int(e))
if s == "" {
return fmt.Sprintf("rbd: ret=%d", errno)
}
return fmt.Sprintf("rbd: ret=%d, %s", errno, s)
} }
func (e rbdError) ErrorCode() int { func (e rbdError) ErrorCode() int {

2
rbd/errors_test.go
View File

@ -13,7 +13,7 @@ func TestRBDError(t *testing.T) {
err = getError(-39) // NOTEMPTY (image still has a snapshot) err = getError(-39) // NOTEMPTY (image still has a snapshot)
assert.Error(t, err) assert.Error(t, err)
assert.Equal(t, err.Error(), "rbd: ret=39, Directory not empty") assert.Equal(t, err.Error(), "rbd: ret=-39, Directory not empty")
errno, ok := err.(interface{ ErrorCode() int }) errno, ok := err.(interface{ ErrorCode() int })
assert.True(t, ok) assert.True(t, ok)