From d101cbc888d98d2a4223d5791382254c40486cbe Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 11 Aug 2020 16:57:18 +0530 Subject: [PATCH] cephfs: replace klog.Error with util.ErrorLog in doSnapshot replace klog.Error with util.ErrorLog in doSnapshot for context based logging. Signed-off-by: Madhu Rajanna --- internal/cephfs/controllerserver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go index eeea73ab3..8e3bd91c0 100644 --- a/internal/cephfs/controllerserver.go +++ b/internal/cephfs/controllerserver.go @@ -579,20 +579,20 @@ func doSnapshot(ctx context.Context, volOpt *volumeOptions, subvolumeName, snaps snap := snapshotInfo{} err := createSnapshot(ctx, volOpt, cr, snapID, volID) if err != nil { - klog.Errorf(util.Log(ctx, "failed to create snapshot %s %v"), snapID, err) + util.ErrorLog(ctx, "failed to create snapshot %s %v", snapID, err) return snap, err } defer func() { if err != nil { dErr := deleteSnapshot(ctx, volOpt, cr, snapID, volID) if dErr != nil { - klog.Errorf(util.Log(ctx, "failed to delete snapshot %s %v"), snapID, err) + util.ErrorLog(ctx, "failed to delete snapshot %s %v", snapID, err) } } }() snap, err = getSnapshotInfo(ctx, volOpt, cr, snapID, volID) if err != nil { - klog.Errorf(util.Log(ctx, "failed to get snapshot info %s %v"), snapID, err) + util.ErrorLog(ctx, "failed to get snapshot info %s %v", snapID, err) return snap, fmt.Errorf("failed to get snapshot info for snapshot:%s", snapID) } var t *timestamp.Timestamp @@ -603,7 +603,7 @@ func doSnapshot(ctx context.Context, volOpt *volumeOptions, subvolumeName, snaps snap.CreationTime = t err = protectSnapshot(ctx, volOpt, cr, snapID, volID) if err != nil { - klog.Errorf(util.Log(ctx, "failed to protect snapshot %s %v"), snapID, err) + util.ErrorLog(ctx, "failed to protect snapshot %s %v", snapID, err) } return snap, err }