From e3c3bbf0e38e75dca04a2d82fb638dac601c31c3 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 11 Aug 2020 17:06:42 +0530 Subject: [PATCH] cephfs: replace klog.Warning with util.WarningLog in CreateVolume replace klog.Warning with util.WarningLog in CreateVolume for context based logging. Signed-off-by: Madhu Rajanna --- internal/cephfs/controllerserver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go index c56e9ebaf..4d48eec43 100644 --- a/internal/cephfs/controllerserver.go +++ b/internal/cephfs/controllerserver.go @@ -147,7 +147,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol // Existence and conflict checks if acquired := cs.VolumeLocks.TryAcquire(requestName); !acquired { - klog.Errorf(util.Log(ctx, util.VolumeOperationAlreadyExistsFmt), requestName) + util.ErrorLog(ctx, util.VolumeOperationAlreadyExistsFmt, requestName) return nil, status.Errorf(codes.Aborted, util.VolumeOperationAlreadyExistsFmt, requestName) } defer cs.VolumeLocks.Release(requestName) @@ -193,7 +193,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol } errUndo := undoVolReservation(ctx, volOptions, *vID, secret) if errUndo != nil { - klog.Warningf(util.Log(ctx, "failed undoing reservation of volume: %s (%s)"), + util.WarningLog(ctx, "failed undoing reservation of volume: %s (%s)", requestName, errUndo) } util.ErrorLog(ctx, "failed to expand volume %s: %v", volumeID(vID.FsSubvolName), err) @@ -230,7 +230,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol if !errors.Is(err, ErrCloneInProgress) { errDefer := undoVolReservation(ctx, volOptions, *vID, secret) if errDefer != nil { - klog.Warningf(util.Log(ctx, "failed undoing reservation of volume: %s (%s)"), + util.WarningLog(ctx, "failed undoing reservation of volume: %s (%s)", requestName, errDefer) } }