fix: add noload mounting option when mounting as read-only

crusoecloud · Jan 15, 2025 · b6813fc · b6813fc
1 parent 53cbd48
commit b6813fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/internal/node/node.go b/internal/node/node.go
@@ -55,6 +55,7 @@ func (d *DefaultNode) NodePublishVolume(_ context.Context, request *csi.NodePubl
 
 	if request.GetReadonly() {
 		mountOpts = append(mountOpts, readOnlyMountOption)
+		mountOpts = append(mountOpts, noLoadMountOption)
 	}
 
 	err := nodePublishVolume(d.Mounter, d.Resizer, mountOpts, d.DiskType, request)

diff --git a/internal/node/util.go b/internal/node/util.go
@@ -21,6 +21,7 @@ const (
 	expectedTypeSegments = 2
 	fsDiskFilesystem     = "virtiofs"
 	readOnlyMountOption  = "ro"
+	noLoadMountOption    = "noload"
 )
 
 var (
@@ -85,12 +86,11 @@ func nodePublishFilesystemVolume(serialNumber string,
 	diskType common.DiskType,
 	request *csi.NodePublishVolumeRequest,
 ) error {
-	// Check if the directory exists
-	if _, err := os.Stat(request.GetTargetPath()); errors.Is(err, os.ErrNotExist) {
-		// Directory does not exist, create it
-		if mkdirErr := os.MkdirAll(request.GetTargetPath(), newDirPerms); mkdirErr != nil {
-			return fmt.Errorf("failed to make directory for target path: %w", mkdirErr)
-		}
+	// Make parent directory for target path
+	// os.MkdirAll will be a noop if the directory already exists
+	mkDirErr := os.MkdirAll(request.GetTargetPath(), newDirPerms)
+	if mkDirErr != nil {
+		return fmt.Errorf("failed to make directory for target path: %w", mkDirErr)
 	}
 
 	mountOpts = append(mountOpts, request.GetVolumeCapability().GetMount().GetMountFlags()...)