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 <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-08-11 16:57:18 +05:30 committed by mergify[bot]
parent 5802265b28
commit d101cbc888

View File

@ -579,20 +579,20 @@ func doSnapshot(ctx context.Context, volOpt *volumeOptions, subvolumeName, snaps
snap := snapshotInfo{} snap := snapshotInfo{}
err := createSnapshot(ctx, volOpt, cr, snapID, volID) err := createSnapshot(ctx, volOpt, cr, snapID, volID)
if err != nil { 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 return snap, err
} }
defer func() { defer func() {
if err != nil { if err != nil {
dErr := deleteSnapshot(ctx, volOpt, cr, snapID, volID) dErr := deleteSnapshot(ctx, volOpt, cr, snapID, volID)
if dErr != nil { 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) snap, err = getSnapshotInfo(ctx, volOpt, cr, snapID, volID)
if err != nil { 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) return snap, fmt.Errorf("failed to get snapshot info for snapshot:%s", snapID)
} }
var t *timestamp.Timestamp var t *timestamp.Timestamp
@ -603,7 +603,7 @@ func doSnapshot(ctx context.Context, volOpt *volumeOptions, subvolumeName, snaps
snap.CreationTime = t snap.CreationTime = t
err = protectSnapshot(ctx, volOpt, cr, snapID, volID) err = protectSnapshot(ctx, volOpt, cr, snapID, volID)
if err != nil { 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 return snap, err
} }