fix(linstor): ensure that drbd is synced up before resizing

Avoid most common drbd sync errors during resize with a cleaner
wait mechanism and friendly user error

Signed-off-by: Antoine Bartuccio <[email protected]>

Author: klmp200

drivers/linstorvolumemanager.py

@@ -841,31 +841,31 @@ def resize_volume(self, volume_uuid, new_size):
         self.ensure_volume_is_not_locked(volume_uuid)
         new_size = self.round_up_volume_size(new_size) // 1024
 
-        retry_count = 30
-        while True:
-            result = self._linstor.volume_dfn_modify(
-                rsc_name=volume_name,
-                volume_nr=0,
-                size=new_size
-            )
-
-            self._mark_resource_cache_as_dirty()
-
-            error_str = self._get_error_str(result)
-            if not error_str:
-                break
+        # We can't resize anything until DRBD is up to date
+        # We wait here for 5min max and raise an easy to understand error for the user
+        # This is mostly an issue for thick provisioning, thin isn't affected
+        start_time = time.monotonic()
+        try:
+            self._linstor.resource_dfn_wait_synced(volume_name, wait_interval=1.0, timeout=60*5)
+        except linstor.LinstorTimeoutError:
+            raise linstor.LinstorTimeoutError(
+                f"Volume `{volume_uuid}` from SR `{self._group_name}` is busy and can't be resized right now. " + 
+                "Please retry later."
+            )
+        util.SMlog(f"DRBD is up to date, syncing took {time.monotonic() - start_time}s")
+
+        result = self._linstor.volume_dfn_modify(
+            rsc_name=volume_name,
+            volume_nr=0,
+            size=new_size
+        )
 
-            # After volume creation, DRBD volume can be unusable during many seconds.
-            # So we must retry the definition change if the device is not up to date.
-            # Often the case for thick provisioning.
-            if retry_count and error_str.find('non-UpToDate DRBD device') >= 0:
-                time.sleep(2)
-                retry_count -= 1
-                continue
+        self._mark_resource_cache_as_dirty()
 
+        error_str = self._get_error_str(result)
+        if error_str:
             raise LinstorVolumeManagerError(
-                'Could not resize volume `{}` from SR `{}`: {}'
-                .format(volume_uuid, self._group_name, error_str)
+                f"Could not resize volume `{volume_uuid}` from SR `{self._group_name}`: {error_str}"
             )
 
     def get_volume_name(self, volume_uuid):