fix allocated size

Author: Wescoeur

drivers/linstorvolumemanager.py

@@ -520,13 +520,10 @@ def allocated_volume_size(self):
                 if volume.storage_pool_name != self._group_name:
                     continue
 
-                current_size = volume.allocated_size
-                if current_size < 0:
-                    raise LinstorVolumeManagerError(
-                       'Failed to get allocated size of `{}` on `{}`'
-                       .format(resource.name, volume.storage_pool_name)
-                    )
-                current[volume.number] = max(current_size, current.get(volume.number) or 0)
+                allocated_size = max(volume.allocated_size, 0)
+                current_allocated_size = current.get(volume.number) or -1
+                if allocated_size > current_allocated_size:
+                    current[volume.number] = allocated_size
 
         total_size = 0
         for volumes in sizes.values():
@@ -2112,32 +2109,31 @@ def _get_volumes_info(self, volume_name=None):
 
             for volume in resource.volumes:
                 # We ignore diskless pools of the form "DfltDisklessStorPool".
-                if volume.storage_pool_name == self._group_name:
-                    if volume.allocated_size < 0:
-                        raise LinstorVolumeManagerError(
-                           'Failed to get allocated size of `{}` on `{}`'
-                           .format(resource.name, volume.storage_pool_name)
-                        )
-                    allocated_size = volume.allocated_size
-
-                    current.allocated_size = current.allocated_size and \
-                        max(current.allocated_size, allocated_size) or \
-                        allocated_size
+                if volume.storage_pool_name != self._group_name:
+                    continue
 
-                    usable_size = volume.usable_size
-                    if usable_size > 0 and (
-                        usable_size < current.virtual_size or
-                        not current.virtual_size
-                    ):
-                        current.virtual_size = usable_size
+                allocated_size = volume.allocated_size
+                if allocated_size > current.allocated_size:
+                    current.allocated_size = allocated_size
 
-        if current.virtual_size <= 0:
-            raise LinstorVolumeManagerError(
-               'Failed to get usable size of `{}` on `{}`'
-               .format(resource.name, volume.storage_pool_name)
-            )
+                usable_size = volume.usable_size
+                if usable_size > 0 and (
+                    usable_size < current.virtual_size or
+                    not current.virtual_size
+                ):
+                    current.virtual_size = usable_size
 
         for current in all_volume_info.values():
+            if current.allocated_size <= 0:
+                raise LinstorVolumeManagerError(
+                    'Failed to get allocated size of `{}`'.format(resource.name)
+                )
+
+            if current.virtual_size <= 0:
+                raise LinstorVolumeManagerError(
+                    'Failed to get usable size of `{}`'.format(resource.name)
+                )
+
             current.allocated_size *= 1024
             current.virtual_size *= 1024
 
@@ -2154,20 +2150,24 @@ def _get_volume_node_names_and_size(self, volume_name):
         ).resources:
             for volume in resource.volumes:
                 # We ignore diskless pools of the form "DfltDisklessStorPool".
-                if volume.storage_pool_name == self._group_name:
-                    node_names.add(resource.node_name)
+                if volume.storage_pool_name != self._group_name:
+                    continue
 
-                    current_size = volume.usable_size
-                    if current_size < 0:
-                        raise LinstorVolumeManagerError(
-                           'Failed to get usable size of `{}` on `{}`'
-                           .format(resource.name, volume.storage_pool_name)
-                        )
+                node_names.add(resource.node_name)
 
-                    if size < 0:
-                        size = current_size
-                    else:
-                        size = min(size, current_size)
+                usable_size = volume.usable_size
+                if usable_size <= 0:
+                    continue
+
+                if size < 0:
+                    size = usable_size
+                else:
+                    size = min(size, usable_size)
+
+        if size <= 0:
+            raise LinstorVolumeManagerError(
+                'Failed to get usable size of `{}`'.format(resource.name)
+            )
 
         return (node_names, size * 1024)