mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: address err113 warnings about direct error comparisons

Browse Source 
Several places in the code compared errors directly with the go-ceph
sentinel errors.  This change uses the errors.Is() function of go
1.13 instead.  The err113 linter reported this issue as:

err113: do not compare errors directly, use errors.Is() instead

Signed-off-by: Sven Anderson <sven@redhat.com>
This commit is contained in:
Sven Anderson
2020-07-02 23:43:40 +02:00
committed by mergify[bot]
parent 7affb9289d
commit de74c36d8c
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/util/cephcmds.go
View File

@ -63,7 +63,7 @@ func GetPoolID(monitors string, cr *Credentials, poolName string) (int64, error)
defer connPool.Put(conn)
id, err := conn.GetPoolByName(poolName)
if err == rados.ErrNotFound {
if errors.Is(err, rados.ErrNotFound) {
return InvalidPoolID, ErrPoolNotFound{poolName, fmt.Errorf("pool (%s) not found in Ceph cluster", poolName)}
} else if err != nil {
return InvalidPoolID, err
@ -247,7 +247,7 @@ func CreateObject(ctx context.Context, monitors string, cr *Credentials, poolNam
}
err = ioctx.Create(objectName, rados.CreateExclusive)
if err == rados.ErrObjectExists {
if errors.Is(err, rados.ErrObjectExists) {
return ErrObjectExists{objectName, err}
} else if err != nil {
klog.Errorf(Log(ctx, "failed creating omap (%s) in pool (%s): (%v)"), objectName, poolName, err)
@ -282,7 +282,7 @@ func RemoveObject(ctx context.Context, monitors string, cr *Credentials, poolNam
}
err = ioctx.Delete(oMapName)
if err == rados.ErrNotFound {
if errors.Is(err, rados.ErrNotFound) {
return ErrObjectNotFound{oMapName, err}
} else if err != nil {
klog.Errorf(Log(ctx, "failed removing omap (%s) in pool (%s): (%v)"), oMapName, poolName, err)

2
internal/util/connection.go
View File

@ -73,7 +73,7 @@ func (cc *ClusterConnection) GetIoctx(pool string) (*rados.IOContext, error) {
ioctx, err := cc.conn.OpenIOContext(pool)
if err != nil {
// ErrNotFound indicates the Pool was not found
if err == rados.ErrNotFound {
if errors.Is(err, rados.ErrNotFound) {
err = ErrPoolNotFound{pool, err}
} else {
err = fmt.Errorf("failed to open IOContext for pool %s: %w", pool, err)