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

build: address errorlint warning

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-06-02 14:18:47 +02:00 committed by mergify[bot]
parent 3a43fb84f8
commit b9b8392f71
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/nfs/controller/volume.go
View File

@ -270,14 +270,14 @@ func (nv *NFSVolume) getNFSCluster() (string, error) {
fs := fscore.NewFileSystem(nv.conn) fs := fscore.NewFileSystem(nv.conn)
fsName, err := fs.GetFsName(nv.ctx, nv.fscID) fsName, err := fs.GetFsName(nv.ctx, nv.fscID)
if err != nil && errors.Is(err, util.ErrPoolNotFound) { if err != nil && errors.Is(err, util.ErrPoolNotFound) {
return "", fmt.Errorf("%w for ID %x: %v", ErrFilesystemNotFound, nv.fscID, err) return "", fmt.Errorf("%w for ID %x: %w", ErrFilesystemNotFound, nv.fscID, err)
} else if err != nil { } else if err != nil {
return "", fmt.Errorf("failed to get filesystem name for ID %x: %w", nv.fscID, err) return "", fmt.Errorf("failed to get filesystem name for ID %x: %w", nv.fscID, err)
} }
mdPool, err := fs.GetMetadataPool(nv.ctx, fsName) mdPool, err := fs.GetMetadataPool(nv.ctx, fsName)
if err != nil && errors.Is(err, util.ErrPoolNotFound) { if err != nil && errors.Is(err, util.ErrPoolNotFound) {
return "", fmt.Errorf("metadata pool for %q %w: %v", fsName, ErrNotFound, err) return "", fmt.Errorf("metadata pool for %q %w: %w", fsName, ErrNotFound, err)
} else if err != nil { } else if err != nil {
return "", fmt.Errorf("failed to get metadata pool for %q: %w", fsName, err) return "", fmt.Errorf("failed to get metadata pool for %q: %w", fsName, err)
} }
@ -291,7 +291,7 @@ func (nv *NFSVolume) getNFSCluster() (string, error) {
clusterName, err := j.FetchAttribute(nv.ctx, mdPool, nv.objectUUID, clusterNameKey) clusterName, err := j.FetchAttribute(nv.ctx, mdPool, nv.objectUUID, clusterNameKey)
if err != nil && errors.Is(err, util.ErrPoolNotFound) || errors.Is(err, util.ErrKeyNotFound) { if err != nil && errors.Is(err, util.ErrPoolNotFound) || errors.Is(err, util.ErrKeyNotFound) {
return "", fmt.Errorf("cluster name for %q %w: %v", nv.objectUUID, ErrNotFound, err) return "", fmt.Errorf("cluster name for %q %w: %w", nv.objectUUID, ErrNotFound, err)
} else if err != nil { } else if err != nil {
return "", fmt.Errorf("failed to get cluster name for %q: %w", nv.objectUUID, err) return "", fmt.Errorf("failed to get cluster name for %q: %w", nv.objectUUID, err)
} }
@ -308,14 +308,14 @@ func (nv *NFSVolume) setNFSCluster(clusterName string) error {
fs := fscore.NewFileSystem(nv.conn) fs := fscore.NewFileSystem(nv.conn)
fsName, err := fs.GetFsName(nv.ctx, nv.fscID) fsName, err := fs.GetFsName(nv.ctx, nv.fscID)
if err != nil && errors.Is(err, util.ErrPoolNotFound) { if err != nil && errors.Is(err, util.ErrPoolNotFound) {
return fmt.Errorf("%w for ID %x: %v", ErrFilesystemNotFound, nv.fscID, err) return fmt.Errorf("%w for ID %x: %w", ErrFilesystemNotFound, nv.fscID, err)
} else if err != nil { } else if err != nil {
return fmt.Errorf("failed to get filesystem name for ID %x: %w", nv.fscID, err) return fmt.Errorf("failed to get filesystem name for ID %x: %w", nv.fscID, err)
} }
mdPool, err := fs.GetMetadataPool(nv.ctx, fsName) mdPool, err := fs.GetMetadataPool(nv.ctx, fsName)
if err != nil && errors.Is(err, util.ErrPoolNotFound) { if err != nil && errors.Is(err, util.ErrPoolNotFound) {
return fmt.Errorf("metadata pool for %q %w: %v", fsName, ErrNotFound, err) return fmt.Errorf("metadata pool for %q %w: %w", fsName, ErrNotFound, err)
} else if err != nil { } else if err != nil {
return fmt.Errorf("failed to get metadata pool for %q: %w", fsName, err) return fmt.Errorf("failed to get metadata pool for %q: %w", fsName, err)
} }

2
internal/rbd/rbd_journal.go
View File

@ -567,7 +567,7 @@ func RegenerateJournal(
err = vi.DecomposeCSIID(rbdVol.VolID) err = vi.DecomposeCSIID(rbdVol.VolID)
if err != nil { if err != nil {
return "", fmt.Errorf("%w: error decoding volume ID (%s) (%s)", return "", fmt.Errorf("%w: error decoding volume ID (%w) (%s)",
ErrInvalidVolID, err, rbdVol.VolID) ErrInvalidVolID, err, rbdVol.VolID)
} }

2
internal/rbd/rbd_util.go
View File

@ -1175,7 +1175,7 @@ func GenVolFromVolID(
err := vi.DecomposeCSIID(volumeID) err := vi.DecomposeCSIID(volumeID)
if err != nil { if err != nil {
return vol, fmt.Errorf("%w: error decoding volume ID (%s) (%s)", return vol, fmt.Errorf("%w: error decoding volume ID (%w) (%s)",
ErrInvalidVolID, err, volumeID) ErrInvalidVolID, err, volumeID)
} }