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

rbd: replace klog with util logger in clone.go

Browse Source 
replace klog with util logger in clone.go

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit c4f30c23c1)
This commit is contained in:
Madhu Rajanna 2020-08-19 16:08:51 +05:30 committed by mergify[bot]
parent 98088ec50a
commit ab53834757
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/rbd/clone.go
View File

@ -27,7 +27,6 @@ import (
librbd "github.com/ceph/go-ceph/rbd" librbd "github.com/ceph/go-ceph/rbd"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
klog "k8s.io/klog/v2"
) )
// checkCloneImage check the cloned image exists, if the cloned image is not // checkCloneImage check the cloned image exists, if the cloned image is not
@ -100,13 +99,13 @@ func (rv *rbdVolume) checkCloneImage(ctx context.Context, parentVol *rbdVolume)
// and add task to flatten temporary cloned image // and add task to flatten temporary cloned image
err = rv.cloneRbdImageFromSnapshot(ctx, snap) err = rv.cloneRbdImageFromSnapshot(ctx, snap)
if err != nil { if err != nil {
klog.Errorf(util.Log(ctx, "failed to clone rbd image %s from snapshot %s: %v"), rv.RbdImageName, snap.RbdSnapName, err) util.ErrorLog(ctx, "failed to clone rbd image %s from snapshot %s: %v", rv.RbdImageName, snap.RbdSnapName, err)
err = fmt.Errorf("failed to clone rbd image %s from snapshot %s: %v", rv.RbdImageName, snap.RbdSnapName, err) err = fmt.Errorf("failed to clone rbd image %s from snapshot %s: %v", rv.RbdImageName, snap.RbdSnapName, err)
return false, err return false, err
} }
err = tempClone.deleteSnapshot(ctx, snap) err = tempClone.deleteSnapshot(ctx, snap)
if err != nil { if err != nil {
klog.Errorf(util.Log(ctx, "failed to delete snapshot: %v"), err) util.ErrorLog(ctx, "failed to delete snapshot: %v", err)
return false, err return false, err
} }
return true, nil return true, nil
@ -182,14 +181,14 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol
// cleanup snapshot // cleanup snapshot
cErr := cleanUpSnapshot(ctx, parentVol, tempSnap, tempClone, rv.conn.Creds) cErr := cleanUpSnapshot(ctx, parentVol, tempSnap, tempClone, rv.conn.Creds)
if cErr != nil { if cErr != nil {
klog.Errorf(util.Log(ctx, "failed to cleanup image %s or snapshot %s: %v"), tempSnap, tempClone, cErr) util.ErrorLog(ctx, "failed to cleanup image %s or snapshot %s: %v", tempSnap, tempClone, cErr)
} }
} }
} }
if err != nil || errClone != nil { if err != nil || errClone != nil {
cErr := cleanUpSnapshot(ctx, tempClone, cloneSnap, rv, rv.conn.Creds) cErr := cleanUpSnapshot(ctx, tempClone, cloneSnap, rv, rv.conn.Creds)
if cErr != nil { if cErr != nil {
klog.Errorf(util.Log(ctx, "failed to cleanup image %s or snapshot %s: %v"), cloneSnap, tempClone, cErr) util.ErrorLog(ctx, "failed to cleanup image %s or snapshot %s: %v", cloneSnap, tempClone, cErr)
} }
} }
}() }()
@ -209,13 +208,13 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol
} }
err = rv.getImageID() err = rv.getImageID()
if err != nil { if err != nil {
klog.Errorf(util.Log(ctx, "failed to get volume id %s: %v"), rv, err) util.ErrorLog(ctx, "failed to get volume id %s: %v", rv, err)
return err return err
} }
err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID, rv.conn.Creds) err = j.StoreImageID(ctx, rv.JournalPool, rv.ReservedID, rv.ImageID, rv.conn.Creds)
if err != nil { if err != nil {
klog.Errorf(util.Log(ctx, "failed to store volume %s: %v"), rv, err) util.ErrorLog(ctx, "failed to store volume %s: %v", rv, err)
return err return err
} }
return nil return nil