sbcli-dev 3.8.40__zip → 3.8.41__zip

{sbcli_dev-3.8.40 → sbcli_dev-3.8.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-dev
-Version: 3.8.40
+Version: 3.8.41
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-3.8.40 → sbcli_dev-3.8.41}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=3.8.40
+SIMPLY_BLOCK_VERSION=3.8.41
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main

{sbcli_dev-3.8.40 → sbcli_dev-3.8.41}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-dev
-Version: 3.8.40
+Version: 3.8.41
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-3.8.40 → sbcli_dev-3.8.41}/simplyblock_core/controllers/tasks_controller.py

@@ -54,22 +54,20 @@ def _add_task(function_name, cluster_id, node_id, device_id,
 
 
 def add_device_mig_task(device_id):
-    # device = db_controller.get_storage_devices(device_id)
-    # for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-    #     for lvol_id in node.lvols:
-    #         _add_task(JobSchedule.FN_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
-    #                   max_retry=0, function_params={'lvol_id': lvol_id})
+    device = db_controller.get_storage_devices(device_id)
+    for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
+        for lvol_id in node.lvols:
+            _add_task(JobSchedule.FN_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
+                      max_retry=0, function_params={'lvol_id': lvol_id})
     return True
 
 
 def add_device_to_auto_restart(device):
-    return True
-    # return _add_task(JobSchedule.FN_DEV_RESTART, device.cluster_id, device.node_id, device.get_id())
+    return _add_task(JobSchedule.FN_DEV_RESTART, device.cluster_id, device.node_id, device.get_id())
 
 
 def add_node_to_auto_restart(node):
-    return True
-    # return _add_task(JobSchedule.FN_NODE_RESTART, node.cluster_id, node.get_id(), "")
+    return _add_task(JobSchedule.FN_NODE_RESTART, node.cluster_id, node.get_id(), "")
 
 
 def list_tasks(cluster_id):
@@ -137,20 +135,20 @@ def get_active_node_mig_task(cluster_id, node_id):
 
 
 def add_device_failed_mig_task(device_id):
-    # device = db_controller.get_storage_devices(device_id)
-    # for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-    #     for lvol_id in node.lvols:
-    #         _add_task(JobSchedule.FN_FAILED_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
-    #                   max_retry=0, function_params={'lvol_id': lvol_id})
+    device = db_controller.get_storage_devices(device_id)
+    for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
+        for lvol_id in node.lvols:
+            _add_task(JobSchedule.FN_FAILED_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
+                      max_retry=0, function_params={'lvol_id': lvol_id})
     return True
 
 
 def add_new_device_mig_task(device_id):
-    # device = db_controller.get_storage_devices(device_id)
-    # for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-    #     for lvol_id in node.lvols:
-    #         _add_task(JobSchedule.FN_NEW_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
-    #                   max_retry=0, function_params={'lvol_id': lvol_id})
+    device = db_controller.get_storage_devices(device_id)
+    for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
+        for lvol_id in node.lvols:
+            _add_task(JobSchedule.FN_NEW_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
+                      max_retry=0, function_params={'lvol_id': lvol_id})
     return True
 
 

{sbcli_dev-3.8.40 → sbcli_dev-3.8.41}/simplyblock_core/services/main_distr_event_collector.py

@@ -76,28 +76,27 @@ def process_device_event(event):
 
 def process_lvol_event(event):
     if event.message in ["error_open", 'error_read', "error_write", "error_unmap"]:
-        vuid = event.object_dict['vuid']
-        lvol = None
+        # vuid = event.object_dict['vuid']
+        node_id = event.node_id
+        lvols = []
         for lv in db_controller.get_lvols():  # pass
-            if lv.vuid == vuid:
-                lvol = lv
-                break
+            if lv.node_id == node_id:
+                lvols.append(lv)
 
-        if not lvol:
-            logger.error(f"LVol with vuid {vuid} not found")
-            event.status = 'lvol_not_found'
+        if not lvols:
+            logger.error(f"LVols on node {node_id} not found")
+            event.status = 'lvols_not_found'
         else:
-            lvol.io_error = True
-            if lvol.status == LVol.STATUS_ONLINE:
-                logger.info("Setting LVol to offline")
-                old_status = lvol.status
-                lvol.status = LVol.STATUS_OFFLINE
-                lvol.write_to_db(db_controller.kv_store)
-                lvol_events.lvol_status_change(lvol, lvol.status, old_status, caused_by="monitor")
-                lvol_events.lvol_io_error_change(lvol, True, False, caused_by="monitor")
-                event.status = 'processed'
-            else:
-                event.status = 'skipped'
+            for lvol in lvols:
+                if lvol.status == LVol.STATUS_ONLINE:
+                    logger.info("Setting LVol to offline")
+                    lvol.io_error = True
+                    old_status = lvol.status
+                    lvol.status = LVol.STATUS_OFFLINE
+                    lvol.write_to_db(db_controller.kv_store)
+                    lvol_events.lvol_status_change(lvol, lvol.status, old_status, caused_by="monitor")
+                    lvol_events.lvol_io_error_change(lvol, True, False, caused_by="monitor")
+            event.status = 'processed'
     else:
         logger.error(f"Unknown LVol event message: {event.message}")
         event.status = "event_unknown"