simon suggestions

avoltz · Aug 7, 2023 · 1135f3a · 1135f3a
1 parent 7be0427
commit 1135f3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/pkg/blob/nodeserver.go b/pkg/blob/nodeserver.go
@@ -362,12 +362,10 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 		providedAuth := cv.NewBlobAuth(accountName, containerName, secretName, secretNamespace, storageAuthType)
 
 		err = annotator.SendProvisionVolume(pv, d.cloud.Config.AzureAuthConfig, providedAuth)
-		if err != nil {
-			if err == cv.ErrVolumeAlreadyBeingProvisioned {
-				klog.V(2).Infof("NodeStageVolume: volume has already been provisioned")
-			} else {
-				return nil, err
-			}
+		if err == cv.ErrVolumeAlreadyBeingProvisioned {
+			klog.V(2).Infof("NodeStageVolume: volume has already been provisioned")
+		} else if err != nil {
+			return nil, err
 		}
 
 		if err = d.edgeCacheManager.MountVolume(accountName, containerName, targetPath); err != nil {

diff --git a/pkg/edgecache/cachevolume/pvc_annotator.go b/pkg/edgecache/cachevolume/pvc_annotator.go
@@ -140,7 +140,7 @@ func (c *PVCAnnotator) SendProvisionVolume(pv *v1.PersistentVolume, cloudConfig
 		return err
 	}
 
-	if prepare := c.needsToBeProvisioned(pvc); !prepare {
+	if !c.needsToBeProvisioned(pvc) {
 		klog.Info("pv is already being provisioned")
 		return ErrVolumeAlreadyBeingProvisioned
 	}