do not check waiters if mount rbd rox

supremind · Jul 16, 2021 · 937ac8c · 937ac8c
1 parent cfdcce6
commit 937ac8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/rbd/rbd_attach.go b/internal/rbd/rbd_attach.go
@@ -283,17 +283,17 @@ func createPath(ctx context.Context, volOpt *rbdVolume, cr *util.Credentials) (s
 }
 
 func waitForrbdImage(ctx context.Context, backoff wait.Backoff, volOptions *rbdVolume) error {
-	imagePath := volOptions.String()
+	if volOptions.DisableInUseChecks {
+		util.UsefulLog(ctx, "valid multi-node attach requested, ignoring watcher in-use result")
+		return nil
+	}
 
+	imagePath := volOptions.String()
 	err := wait.ExponentialBackoff(backoff, func() (bool, error) {
 		used, err := volOptions.isInUse()
 		if err != nil {
 			return false, fmt.Errorf("fail to check rbd image status: (%w)", err)
 		}
-		if (volOptions.DisableInUseChecks) && (used) {
-			util.UsefulLog(ctx, "valid multi-node attach requested, ignoring watcher in-use result")
-			return used, nil
-		}
 		return !used, nil
 	})
 	// return error if rbd image has not become available for the specified timeout

diff --git a/internal/util/validate.go b/internal/util/validate.go
@@ -90,7 +90,7 @@ func CheckReadOnlyManyIsSupported(req *csi.CreateVolumeRequest) error {
 			writable = true
 		}
 	}
-	if ! writable && req.GetVolumeContentSource() == nil {
+	if !writable && req.GetVolumeContentSource() == nil {
 		return status.Error(codes.InvalidArgument, "readOnly accessMode is supported only with content source")
 	}
 	return nil