From fe384bccfe40597d3a54b64d5f3408f27be10130 Mon Sep 17 00:00:00 2001 From: Mehdy Khoshnoody Date: Thu, 28 May 2020 21:38:25 +0430 Subject: [PATCH] rbd: Fix error checking mistake in CreateVolume deleteErr should be checked if it's nil instead of err Signed-off-by: Mehdy Khoshnoody --- internal/rbd/controllerserver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index d49982d2b..568b5e422 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -230,9 +230,9 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol if rbdVol.Encrypted { err = rbdVol.ensureEncryptionMetadataSet(rbdImageRequiresEncryption) if err != nil { - klog.Errorf(util.Log(ctx, "failed to save encryption status, deleting image %s"), - rbdVol.RbdImageName) - if deleteErr := deleteImage(ctx, rbdVol, cr); err != nil { + klog.Errorf(util.Log(ctx, "failed to save encryption status, deleting image %s: %s"), + rbdVol.RbdImageName, err) + if deleteErr := deleteImage(ctx, rbdVol, cr); deleteErr != nil { klog.Errorf(util.Log(ctx, "failed to delete rbd image: %s/%s with error: %v"), rbdVol.Pool, rbdVol.RbdImageName, deleteErr) return nil, deleteErr