🐛 Fix storage pool handling in meta patch

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

Author: mhkarimi1383

rawfile/internal_svc.py

@@ -63,12 +63,13 @@ def ExpandRawFile(
                     is_attached=volume_manager.is_attached(request.volume_id),
                     status=internal_pb2.ExpandRawFileStatus.RESOURCE_EXHAUSTED,
                 )
-            if metadata(request.volume_id).get("thin_provision", False):
+            if meta.get("thin_provision", False):
                 truncate(img_file_path, request.new_size)
             else:
                 fallocate(img_file_path, request.new_size)
             patch_metadata(
                 request.volume_id,
+                meta["storage_pool"],
                 {"size": request.new_size},
             )
             return internal_pb2.ExpandRawFileResponse(

rawfile/utils/rawfile.py

@@ -74,8 +74,8 @@ def _owner_umask():
         os.umask(old_umask)  # Restore original umask
 
 
-def update_metadata(volume_id: str, obj: dict) -> dict:
-    update_permissions(volume_id)
+def update_metadata(volume_id: str, storage_pool: str, obj: dict) -> dict:
+    update_permissions(volume_id, storage_pool)
     with _owner_umask():
         meta_tmp = meta_file_tmp(volume_id)
         meta = meta_file(volume_id)
@@ -95,12 +95,11 @@ def update_metadata(volume_id: str, obj: dict) -> dict:
     return obj
 
 
-def update_permissions(volume_id: str) -> None:
+def update_permissions(volume_id: str, storage_pool: str) -> None:
     from utils.volume_manager import manager as volume_manager
     from itertools import chain
 
-    meta = metadata(volume_id)
-    _img_dir = volume_manager._get_volume_path(meta["storage_pool"], volume_id)
+    _img_dir = volume_manager._get_volume_path(storage_pool, volume_id)
     if not _img_dir.exists():
         return
     _img_dir.chmod(D_PERMS)
@@ -112,10 +111,10 @@ def update_permissions(volume_id: str) -> None:
         each.chmod(F_PERMS)
 
 
-def patch_metadata(volume_id: str, obj: dict) -> dict:
+def patch_metadata(volume_id: str, storage_pool: str, obj: dict) -> dict:
     old_data = metadata_or(volume_id)
     new_data = {**old_data, **obj}
-    return update_metadata(volume_id, new_data)
+    return update_metadata(volume_id, storage_pool, new_data)
 
 
 def truncate(img_file, size):

rawfile/utils/snapshot_manager.py

@@ -76,7 +76,11 @@ def create_snapshot(
                 reflink_attached = list(set(meta.get("reflink_attached", [])))
                 if copy_on_write:
                     reflink_attached.append(name)
-                patch_metadata(volume_id, {"reflink_attached": reflink_attached})
+                patch_metadata(
+                    volume_id,
+                    meta["storage_pool"],
+                    {"reflink_attached": reflink_attached},
+                )
                 return Snapshot(
                     name=name,
                     volume_id=volume_id,
@@ -110,7 +114,11 @@ def delete_snapshot(self, volume_id: str, name: str, temporary: bool = False):
             reflink_attached = list(set(meta.get("reflink_attached", [])))
             if name in reflink_attached:
                 reflink_attached.remove(name)
-                patch_metadata(volume_id, {"reflink_attached": reflink_attached})
+                patch_metadata(
+                    volume_id,
+                    meta["storage_pool"],
+                    {"reflink_attached": reflink_attached},
+                )
 
     def restore_snapshot(
         self, volume_id: str, name: str, destination: Path, temporary: bool = False

rawfile/utils/volume_manager.py

@@ -62,6 +62,7 @@ def create_volume(
         meta_dir(volume_id).mkdir(exist_ok=True, parents=True)
         patch_metadata(
             volume_id,
+            storage_pool,
             {
                 "schema_version": LATEST_SCHEMA_VERSION,
                 "storage_pool": storage_pool,
@@ -108,6 +109,7 @@ def create_volume(
                 snapshots_dir.joinpath("temp").mkdir(exist_ok=True, parents=True)
                 patch_metadata(
                     volume_id,
+                    storage_pool,
                     {
                         "volume_id": volume_id,
                         "created_at": time.time(),
@@ -148,7 +150,7 @@ def create_volume(
                     truncate(img_file, size)
                 else:
                     fallocate(img_file, size)
-                patch_metadata(volume_id, {"ready": True})
+                patch_metadata(volume_id, storage_pool, {"ready": True})
         finally:
             if source_type == VolumeSource.volume and (
                 source_volume_id and snapshot_name
@@ -224,7 +226,9 @@ def delete_volume(self, volume_id):
         gc_at = now
         with VolLock(volume_id):
             patch_metadata(
-                volume_id, {"deleted_at": deleted_at, "gc_at": gc_at, "ready": False}
+                volume_id,
+                meta["storage_pool"],
+                {"deleted_at": deleted_at, "gc_at": gc_at, "ready": False},
             )
         self.gc_if_needed(volume_id, dry_run=False)
         return vol_img_size
@@ -267,7 +271,14 @@ def get_all_volumes_stats(self) -> dict[str, VolumeStats]:
     def migrate_metadata(self, volume_id, target_version):
         old_data = metadata_or(volume_id)
         new_data = migrate_to(old_data, target_version)
-        return update_metadata(volume_id, new_data)
+        return update_metadata(
+            volume_id,
+            old_data.get(
+                "storage_pool",
+                new_data.get("storage_pool", config.csi_driver.default_pool),
+            ),
+            new_data,
+        )
 
     def migrate_metadata_dir(self):
         for old_meta in glob(