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: resolve errorlint issues

Browse Source 
This commit resolves errorlint issues
which checks for the code that will cause
problems with the error wrapping scheme.

Updates: #1586

Signed-off-by: Yati Padia <ypadia@redhat.com>
This commit is contained in:
Yati Padia
2021-07-10 16:15:11 +05:30
committed by mergify[bot]
parent bfda5fa57f
commit 3469dfc753
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rbd/rbd_attach.go
View File

@ -325,7 +325,7 @@ func createPath(ctx context.Context, volOpt *rbdVolume, device string, cr *util.
util.WarningLog(ctx, "rbd: %s unmap error %v", imagePath, detErr)
}
}
return "", fmt.Errorf("rbd: map failed with error %v, rbd error output: %s", err, stderr)
return "", fmt.Errorf("rbd: map failed with error %w, rbd error output: %s", err, stderr)
}
devicePath := strings.TrimSuffix(stdout, "\n")

6
internal/rbd/rbd_util.go
View File

@ -265,7 +265,7 @@ func createImage(ctx context.Context, pOpts *rbdVolume, cr *util.Credentials) er
if pOpts.isEncrypted() {
err = pOpts.setupEncryption(ctx)
if err != nil {
return fmt.Errorf("failed to setup encryption for image %s: %v", pOpts, err)
return fmt.Errorf("failed to setup encryption for image %s: %w", pOpts, err)
}
}
@ -1579,10 +1579,10 @@ func (ri *rbdImage) setThinProvisioned() error {
// the expansion can be allocated too.
func (ri *rbdImage) isThickProvisioned() (bool, error) {
value, err := ri.GetMetadata(thickProvisionMetaKey)
if err == librbd.ErrNotFound {
if errors.Is(err, librbd.ErrNotFound) {
// check if the image is having deprecated metadata key.
value, err = ri.GetMetadata(deprecatedthickProvisionMetaKey)
if err == librbd.ErrNotFound {
if errors.Is(err, librbd.ErrNotFound) {
return false, nil
}
// If we reach here means the image has deprecated metakey set. Set the

3
internal/util/pidlimit.go
View File

@ -18,6 +18,7 @@ package util
import (
"bufio"
"errors"
"fmt"
"io"
"os"
@ -78,7 +79,7 @@ func GetPIDLimit() (int, error) {
defer f.Close() // #nosec: error on close is not critical here
maxPidsStr, err := bufio.NewReader(f).ReadString('\n')
if err != nil && err != io.EOF {
if err != nil && !errors.Is(err, io.EOF) {
return 0, err
}
maxPidsStr = strings.TrimRight(maxPidsStr, "\n")

2
internal/util/topology.go
View File

@ -151,7 +151,7 @@ func GetTopologyFromRequest(
err := json.Unmarshal([]byte(strings.Replace(topologyPoolsStr, "\n", " ", -1)), &topologyPools)
if err != nil {
return nil, nil, fmt.Errorf(
"failed to parse JSON encoded topology constrained pools parameter (%s): %v",
"failed to parse JSON encoded topology constrained pools parameter (%s): %w",
topologyPoolsStr,
err)
}

2
internal/util/topology_test.go
View File

@ -226,7 +226,7 @@ func TestFindPoolAndTopology(t *testing.T) {
checkOutput := func(err error, poolName string, topoSegment map[string]string) error {
if err != nil {
return fmt.Errorf("expected success, got err (%v)", err)
return fmt.Errorf("expected success, got err (%w)", err)
}
if poolName != pool1 || !(len(topoSegment) == 2) &&
topoSegment[topologyPrefix+"/"+label1] == l1Value1 &&