mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-26 08:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: avoid comparing errors directly

Browse Source 
Go 1.13 contains support for error wrapping. To support wrapping,
fmt.Errorf now has a %w verb for creating wrapped errors, and three
new functions in the errors package ( errors.Unwrap, errors.Is and
errors.As) simplify unwrapping and inspecting wrapped errors.

With this change, If we currently compare errors using ==, we have to
use errors.Is instead. Example:

if err == io.ErrUnexpectedEOF

becomes

if errors.Is(err, io.ErrUnexpectedEOF)

https://tip.golang.org/doc/go1.13#error_wrapping

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2020-06-11 13:34:32 +05:30 committed by mergify[bot]
parent e111f2b613
commit 323cc0e3bb
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/utils.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"regexp" "regexp"
@ -177,7 +178,7 @@ func waitForDeploymentComplete(name, ns string, c clientset.Interface, t int) er
return false, nil return false, nil
}) })
if err == wait.ErrWaitTimeout { if errors.Is(err, wait.ErrWaitTimeout) {
err = fmt.Errorf("%s", reason) err = fmt.Errorf("%s", reason)
} }
if err != nil { if err != nil {

3
internal/rbd/rbd_attach.go
View File

@ -19,6 +19,7 @@ package rbd
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
@ -257,7 +258,7 @@ func waitForrbdImage(ctx context.Context, backoff wait.Backoff, volOptions *rbdV
return !used, nil return !used, nil
}) })
// return error if rbd image has not become available for the specified timeout // return error if rbd image has not become available for the specified timeout
if err == wait.ErrWaitTimeout { if errors.Is(err, wait.ErrWaitTimeout) {
return fmt.Errorf("rbd image %s is still being used", imagePath) return fmt.Errorf("rbd image %s is still being used", imagePath)
} }
// return error if any other errors were encountered during waiting for the image to become available // return error if any other errors were encountered during waiting for the image to become available

2
internal/rbd/rbd_util.go
View File

@ -267,7 +267,7 @@ func rbdStatus(ctx context.Context, pOpts *rbdVolume, cr *util.Credentials) (boo
output = string(cmd) output = string(cmd)
if err, ok := err.(*exec.Error); ok { if err, ok := err.(*exec.Error); ok {
if err.Err == exec.ErrNotFound { if errors.Is(err.Err, exec.ErrNotFound) {
klog.Errorf(util.Log(ctx, "rbd cmd not found")) klog.Errorf(util.Log(ctx, "rbd cmd not found"))
// fail fast if command not found // fail fast if command not found
return false, output, err return false, output, err

2
internal/util/nodecache.go
View File

@ -62,7 +62,7 @@ func (nc *NodeCache) ForAll(pattern string, destObj interface{}, f ForAllFunc) e
cachePath := path.Join(nc.BasePath, nc.CacheDir) cachePath := path.Join(nc.BasePath, nc.CacheDir)
for _, file := range files { for _, file := range files {
err = decodeObj(cachePath, pattern, file, destObj) err = decodeObj(cachePath, pattern, file, destObj)
if err == errDec { if errors.Is(err, errDec) {
continue continue
} else if err == nil { } else if err == nil {
if err = f(strings.TrimSuffix(file.Name(), filepath.Ext(file.Name()))); err != nil { if err = f(strings.TrimSuffix(file.Name(), filepath.Ext(file.Name()))); err != nil {