noload option appended

internal/rbd/controllerserver.go

@@ -1131,7 +1131,15 @@ func (cs *ControllerServer) ControllerPublishVolume(ctx context.Context, req *cs
 		ro = "true"
 	}
 
-	return &csi.ControllerPublishVolumeResponse{PublishContext: map[string]string{readonlyAttachmentKey: ro}}, nil
+	volctx := req.GetVolumeContext()
+	var block string
+
+	if _, ok := volctx["writeBlock"]; ok {
+
+		block = volctx["writeBlock"]
+	}
+
+	return &csi.ControllerPublishVolumeResponse{PublishContext: map[string]string{readonlyAttachmentKey: ro, "writeBlock": block}}, nil
 }
 
 // ControllerUnpublishVolume does nothing.

internal/rbd/nodeserver.go

@@ -117,6 +117,12 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
 		return nil, err
 	}
 
+	if req.VolumeCapability.AccessMode.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER {
+		if req.GetPublishContext()[readonlyAttachmentKey] == "true" {
+			return nil, status.Error(codes.InvalidArgument, "vol has already been mount as ReadWrite on another node")
+		}
+	}
+
 	disableInUseChecks := req.GetPublishContext()[readonlyAttachmentKey] == "true"
 	isBlock := req.GetVolumeCapability().GetBlock() != nil
 	// disableInUseChecks := false
@@ -459,7 +465,9 @@ func (ns *NodeServer) mountVolumeToStagePath(ctx context.Context, req *csi.NodeS
 		}
 	}
 	if csicommon.MountOptionContains(opt, rOnly) {
+		// readOnly mount with noload option
 		readOnly = true
+		opt = append(opt, "noload")
 	}
 
 	if fsType == "xfs" {