sbcli-dev 4.0.3__zip → 4.0.4__zip

{sbcli_dev-4.0.3 → sbcli_dev-4.0.4}/PKG-INFO

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

{sbcli_dev-4.0.3 → sbcli_dev-4.0.4}/env_var

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

{sbcli_dev-4.0.3 → sbcli_dev-4.0.4}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.3 → sbcli_dev-4.0.4}/simplyblock_core/controllers/device_controller.py

@@ -38,6 +38,19 @@ def device_set_state(device_id, state):
     old_status = dev.status
     device.status = state
     snode.write_to_db(db_controller.kv_store)
+
+    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")
+        snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
+        for node in snodes:
+            if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
+                continue
+            node.remote_devices = storage_node_ops._connect_to_remote_devs(node)
+            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_dev_status_event(device, device.status)
     device_events.device_status_change(device, device.status, old_status)
     return True
@@ -80,19 +93,6 @@ def device_set_read_only(device_id):
 
 
 def device_set_online(device_id):
-    db_controller = DBController()
-    dev = db_controller.get_storage_devices(device_id)
-    snode = db_controller.get_storage_node_by_id(dev.node_id)
-    logger.info("Make other nodes connect to the node devices")
-    snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
-    for node in snodes:
-        if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
-            continue
-        node.remote_devices = storage_node_ops._connect_to_remote_devs(node)
-        if node.enable_ha_jm:
-            node.remote_jm_devices = storage_node_ops._connect_to_remote_jm_devs(node)
-        node.write_to_db()
-
     ret = device_set_state(device_id, NVMeDevice.STATUS_ONLINE)
     if ret:
         logger.info("Adding task to device data migration")

{sbcli_dev-4.0.3 → sbcli_dev-4.0.4}/simplyblock_core/controllers/tasks_controller.py

@@ -80,8 +80,7 @@ def add_device_mig_task(device_id):
 
 
 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):

{sbcli_dev-4.0.3 → sbcli_dev-4.0.4}/simplyblock_core/storage_node_ops.py

@@ -790,7 +790,10 @@ def _connect_to_remote_jm_devs(this_node, jm_ids=[]):
         this_node.rpc_username, this_node.rpc_password, timeout=10, retry=2)
 
     node_bdevs = rpc_client.get_bdevs()
-    node_bdev_names = [b['name'] for b in node_bdevs]
+    if node_bdevs:
+        node_bdev_names = [b['name'] for b in node_bdevs]
+    else:
+        node_bdev_names = []
     remote_devices = []
     if jm_ids:
         for jm_id in jm_ids: