🐛 Fix default fs handling

Signed-off-by: Muhammed Hussain Karimi <[email protected]>

Author: mhkarimi1383

.github/workflows/k8s.yml

@@ -103,10 +103,10 @@ jobs:
         with:
           name: smoke-k8s-dump
           path: dump
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        timeout-minutes: 120
-        uses: mxschmitt/action-tmate@v3
+      # - name: Setup tmate session
+      #   if: ${{ failure() }}
+      #   timeout-minutes: 120
+      #   uses: mxschmitt/action-tmate@v3
 
   release-check:
     if: ${{ inputs.release-check }}

rawfile/bd2fs.py

@@ -106,7 +106,8 @@ def NodeGetInfo(self, request, context):
     @log_grpc_request
     def NodeStageVolume(self, request, context):
         with VolLock(request.volume_id):
-            if not metadata_or(volume_id=request.volume_id).get("ready", False):
+            meta = metadata_or(volume_id=request.volume_id)
+            if not meta.get("ready", False):
                 raise VolumeNotReadyError(request.volume_id)
             bd_stage_request = NodeStageVolumeRequest()
             bd_stage_request.CopyFrom(request)
@@ -141,7 +142,13 @@ def NodeStageVolume(self, request, context):
                     format_options = format_options_str.split(" ")
                 default_fs = request.volume_capability.mount.fs_type
                 fs = get_from_device_or_fallback(
-                    bd_publish_request.target_path, (default_fs or config.default_fs)
+                    bd_publish_request.target_path,
+                    (
+                        default_fs
+                        or config.csi_driver.storage_pools[
+                            meta["storage_pool"]
+                        ].default_fs
+                    ),
                 )
                 fs.mountpoint = f"{request.staging_target_path}/mount"
                 fs.format_and_mount(