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

cleanup: remove unnecessary calling of .String() when logging

Browse Source 
This commit removes calling of .String() when logging
since `%s`,`%v` or `%q` will call an existing .String() function
automatically.

Fixes: #2051

Signed-off-by: Rakshith R <rar@redhat.com>
This commit is contained in:
Rakshith R
2021-05-07 11:00:37 +05:30
committed by mergify[bot]
parent 19a4d12bec
commit 6618e2012d
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/rbd/mirror.go
View File

@ -30,13 +30,13 @@ import (
func (ri *rbdImage) enableImageMirroring(mode librbd.ImageMirrorMode) error {
image, err := ri.open()
if err != nil {
return fmt.Errorf("failed to open image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to open image %q with error: %w", ri, err)
}
defer image.Close()
err = image.MirrorEnable(mode)
if err != nil {
return fmt.Errorf("failed to enable mirroring on %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to enable mirroring on %q with error: %w", ri, err)
}
return nil
}
@ -45,13 +45,13 @@ func (ri *rbdImage) enableImageMirroring(mode librbd.ImageMirrorMode) error {
func (ri *rbdImage) disableImageMirroring(force bool) error {
image, err := ri.open()
if err != nil {
return fmt.Errorf("failed to open image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to open image %q with error: %w", ri, err)
}
defer image.Close()
err = image.MirrorDisable(force)
if err != nil {
return fmt.Errorf("failed to disable mirroring on %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to disable mirroring on %q with error: %w", ri, err)
}
return nil
}
@ -60,13 +60,13 @@ func (ri *rbdImage) disableImageMirroring(force bool) error {
func (ri *rbdImage) getImageMirroringInfo() (*librbd.MirrorImageInfo, error) {
image, err := ri.open()
if err != nil {
return nil, fmt.Errorf("failed to open image %q with error: %w", ri.String(), err)
return nil, fmt.Errorf("failed to open image %q with error: %w", ri, err)
}
defer image.Close()
info, err := image.GetMirrorImageInfo()
if err != nil {
return nil, fmt.Errorf("failed to get mirroring info of %q with error: %w", ri.String(), err)
return nil, fmt.Errorf("failed to get mirroring info of %q with error: %w", ri, err)
}
return info, nil
}
@ -75,12 +75,12 @@ func (ri *rbdImage) getImageMirroringInfo() (*librbd.MirrorImageInfo, error) {
func (ri *rbdImage) promoteImage(force bool) error {
image, err := ri.open()
if err != nil {
return fmt.Errorf("failed to open image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to open image %q with error: %w", ri, err)
}
defer image.Close()
err = image.MirrorPromote(force)
if err != nil {
return fmt.Errorf("failed to promote image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to promote image %q with error: %w", ri, err)
}
return nil
}
@ -89,12 +89,12 @@ func (ri *rbdImage) promoteImage(force bool) error {
func (ri *rbdImage) demoteImage() error {
image, err := ri.open()
if err != nil {
return fmt.Errorf("failed to open image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to open image %q with error: %w", ri, err)
}
defer image.Close()
err = image.MirrorDemote()
if err != nil {
return fmt.Errorf("failed to demote image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to demote image %q with error: %w", ri, err)
}
return nil
}
@ -103,12 +103,12 @@ func (ri *rbdImage) demoteImage() error {
func (ri *rbdImage) resyncImage() error {
image, err := ri.open()
if err != nil {
return fmt.Errorf("failed to open image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to open image %q with error: %w", ri, err)
}
defer image.Close()
err = image.MirrorResync()
if err != nil {
return fmt.Errorf("failed to resync image %q with error: %w", ri.String(), err)
return fmt.Errorf("failed to resync image %q with error: %w", ri, err)
}
return nil
}