sbcli-hmdi 0.0.43__tar.gz → 0.0.44__tar.gz

{sbcli_hmdi-0.0.43 → sbcli_hmdi-0.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.43
+Version: 0.0.44
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.43 → sbcli_hmdi-0.0.44}/sbcli_hmdi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.43
+Version: 0.0.44
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.43 → sbcli_hmdi-0.0.44}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-hmdi
-SIMPLY_BLOCK_VERSION=0.0.43
+SIMPLY_BLOCK_VERSION=0.0.44
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:hmdi
 DOCKER_USER=hamdysimplyblock

{sbcli_hmdi-0.0.43 → sbcli_hmdi-0.0.44}/simplyblock_core/services/main_distr_event_collector.py

@@ -54,24 +54,26 @@ def process_device_event(event):
             event.status = 'skipped:node_offline'
             return
 
+        if device_node_obj.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:
+            logger.info(f"Node is not online, skipping. status: {event_node_obj.status}")
+            event.status = 'skipped:device_node_offline'
+            return
+
         if device_node_obj.get_id() == event_node_obj.get_id():
             if event.message == 'SPDK_BDEV_EVENT_REMOVE':
                 logger.info(f"Removing storage id: {storage_id} from node: {node_id}")
                 device_controller.device_remove(device_obj.get_id())
-                event.status = 'processed'
-                return
 
-        # if event.message in ['error_write', 'error_unmap']:
-        #     logger.info(f"Setting device to read-only")
-        #     device_controller.device_set_read_only(device_obj.get_id())
-        # else:
+            elif event.message in ['error_write', 'error_unmap']:
+                logger.info(f"Setting device to read-only")
+                device_controller.device_set_read_only(device_obj.get_id())
 
-        if device_node_obj.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:
-            logger.info(f"Node is not online, skipping. status: {event_node_obj.status}")
-            event.status = 'skipped:node_offline'
-            return
+            else:
+                logger.info(f"Setting device to unavailable")
+                device_controller.device_set_unavailable(device_obj.get_id())
+                device_controller.device_set_io_error(device_obj.get_id(), True)
 
-        if device_node_obj.get_id() != event_node_obj.get_id() and event.message in ['error_open', 'SPDK_BDEV_EVENT_REMOVE']:
+        else:
             event_node_obj = db_controller.get_storage_node_by_id(event_node_obj.get_id())
             for dev in event_node_obj.remote_devices:
                 if dev.get_id() == device_obj.get_id():
@@ -79,12 +81,22 @@ def process_device_event(event):
                     event_node_obj.write_to_db()
                     break
 
-        else:
-
-            logger.info(f"Setting device to unavailable")
-            device_controller.device_set_unavailable(device_obj.get_id())
-            # if event.message in ['error_write', 'error_unmap', 'error_read']:
-            device_controller.device_set_io_error(device_obj.get_id(), True)
+            # check other nodes
+            node_not_connected = 0
+            for node in db_controller.get_storage_nodes_by_cluster_id(event_node_obj.cluster_id):
+                if node.status == StorageNode.STATUS_ONLINE and node.get_id() != device_node_obj.get_id():
+                    found = False
+                    for remote_device in node.remote_devices:
+                        if remote_device.get_id() == device_obj.get_id():
+                            found = True
+                            break
+                    if not found:
+                        node_not_connected += 1
+
+            if node_not_connected >= 2:
+                logger.info(f"Setting device to unavailable")
+                device_controller.device_set_unavailable(device_obj.get_id())
+                device_controller.device_set_io_error(device_obj.get_id(), True)
 
         event.status = 'processed'
 

{sbcli_hmdi-0.0.43 → sbcli_hmdi-0.0.44}/simplyblock_core/utils.py

@@ -525,7 +525,7 @@ def calculate_minimum_hp_memory(small_pool_count, large_pool_count, lvol_count,
     pool_consumption = (small_pool_count * 8 + large_pool_count * 128) / 1024 + 1092
     max_prov_tb = max_prov / (1024 * 1024 * 1024 * 1024)
     memory_consumption = (4 * cpu_count + 1.0277 * pool_consumption + 25 * lvol_count) * (1024 * 1024) + (250 * 1024 * 1024) * 1.1 * max_prov_tb + constants.EXTRA_HUGE_PAGE_MEMORY
-    return int(memory_consumption)
+    return int(memory_consumption*2)
 
 
 def calculate_minimum_sys_memory(max_prov, total):
@@ -732,4 +732,4 @@ def get_next_port(cluster_id):
         if next_port not in used_ports:
             return next_port
 
-    return 0
+    return 0