add -1 storage id for failed devices

Author: hamdy-simplyblock

env_var

@@ -1,5 +1,5 @@
-SIMPLY_BLOCK_COMMAND_NAME=sbcli-alsh
-SIMPLY_BLOCK_VERSION=5.2.7
+SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
+SIMPLY_BLOCK_VERSION=5.2.8
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

simplyblock_core/controllers/device_controller.py

@@ -42,6 +42,8 @@ def device_set_state(device_id, state):
     device.status = state
     snode.write_to_db(db_controller.kv_store)
 
+    distr_controller.send_cluster_map_to_node(snode)
+
     if state == NVMeDevice.STATUS_ONLINE:
         snode = db_controller.get_storage_node_by_id(dev.node_id)
         logger.info("Make other nodes connect to the node devices")
@@ -53,8 +55,8 @@ def device_set_state(device_id, state):
             if node.enable_ha_jm:
                 node.remote_jm_devices = storage_node_ops._connect_to_remote_jm_devs(node)
             node.write_to_db()
+            distr_controller.send_cluster_map_to_node(node)
 
-    distr_controller.send_dev_status_event(device, device.status)
     device_events.device_status_change(device, device.status, old_status)
     return True
 

simplyblock_core/distr_controller.py

@@ -115,9 +115,11 @@ def get_distr_cluster_map(snodes, target_node):
                 "status": dev_status,
                 # "physical_label": dev.physical_label
             }
-            dev_w_map.append({
-                "weight": dev_w,
-                "id": dev.cluster_device_order})
+            if dev.status in [NVMeDevice.STATUS_FAILED, NVMeDevice.STATUS_FAILED_AND_MIGRATED]:
+                dev_w_map.append({"weight": dev_w, "id": -1})
+            else:
+                dev_w_map.append({"weight": dev_w, "id": dev.cluster_device_order})
+
         node_status = snode.status
         if node_status == StorageNode.STATUS_SCHEDULABLE:
             node_status = StorageNode.STATUS_UNREACHABLE