nodeserver: safe exit when pvc is already being provisioned

avoltz · Jul 12, 2023 · 573177f · 573177f
1 parent 441e632
commit 573177f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/pkg/blob/nodeserver.go b/pkg/blob/nodeserver.go
@@ -360,7 +360,13 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 
 		annotator := cv.NewPVCAnnotator(d.cloud.KubeClient)
 		providedAuth := cv.NewBlobAuth(accountName, containerName, secretName, secretNamespace, storageAuthType)
-		if err := annotator.SendProvisionVolume(pv, d.cloud.Config.AzureAuthConfig, providedAuth); err != nil {
+
+		err = annotator.SendProvisionVolume(pv, d.cloud.Config.AzureAuthConfig, providedAuth)
+		if err != nil {
+			if err == cv.ErrVolumeAlreadyBeingProvisioned {
+				return &csi.NodeStageVolumeResponse{}, nil
+			}
+
 			return nil, err
 		}
 

diff --git a/pkg/edgecache/cachevolume/pvc_annotator.go b/pkg/edgecache/cachevolume/pvc_annotator.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cachevolume
 
 import (
+	"errors"
 	"fmt"
 
 	"golang.org/x/exp/maps"
@@ -41,7 +42,8 @@ const (
 )
 
 var (
-	validStorageAuthentications = []string{"WorkloadIdentity", "AccountKey"}
+	validStorageAuthentications   = []string{"WorkloadIdentity", "AccountKey"}
+	ErrVolumeAlreadyBeingProvisioned = errors.New("pv is already being provisioned")
 )
 
 type BlobAuth struct {
@@ -145,9 +147,8 @@ func (c *PVCAnnotator) SendProvisionVolume(pv *v1.PersistentVolume, cloudConfig
 	}
 
 	if prepare := c.needsToBeProvisioned(pvc); !prepare {
-		err := fmt.Errorf("pv is already being provisioned")
-		klog.Error(err)
-		return err
+		klog.Info("pv is already being provisioned")
+		return ErrVolumeAlreadyBeingProvisioned
 	}
 
 	annotations, err := c.buildAnnotations(pv, cloudConfig, providedAuth)