sbcli-dev 5.2.7__tar.gz → 5.2.9__tar.gz

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/PKG-INFO

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

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/env_var

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

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/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
 

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/simplyblock_core/controllers/lvol_controller.py

@@ -715,6 +715,11 @@ def recreate_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=None):
     ret = rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid)
     logger.debug(ret)
 
+    logger.info("Add BDev to subsystem")
+    ret = rpc_client.nvmf_subsystem_add_ns(lvol.nqn, lvol.top_bdev, lvol.uuid, lvol.guid)
+    if not ret:
+        return False, "Failed to add bdev to subsystem"
+
     cluster = db_controller.get_cluster_by_id(snode.cluster_id)
     # add listeners
     logger.info("adding listeners")
@@ -732,18 +737,13 @@ def recreate_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=None):
             logger.info("adding listener for %s on IP %s" % (lvol.nqn, iface.ip4_address))
             ret = rpc_client.listeners_create(lvol.nqn, tr_type, iface.ip4_address, "4420")
             is_optimized = False
-            # if lvol.node_id == snode.get_id():
-            #     is_optimized = True
+            if lvol.node_id == snode.get_id():
+                is_optimized = True
             logger.info(f"Setting ANA state: {is_optimized}")
             ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
                 lvol.nqn, iface.ip4_address, "4420", is_optimized)
 
 
-    logger.info("Add BDev to subsystem")
-    ret = rpc_client.nvmf_subsystem_add_ns(lvol.nqn, lvol.top_bdev, lvol.uuid, lvol.guid)
-    if not ret:
-        return False, "Failed to add bdev to subsystem"
-
     return True, None
 
 

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/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

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/simplyblock_core/services/tasks_runner_migration.py

@@ -87,7 +87,7 @@ def task_runner(task):
         res = rpc_client.distr_migration_status(**mig_info)
         for st in res:
             if st['status'] == "completed":
-                if st['error'] == 1:
+                if st['error'] != 0:
                     task.function_result = "mig completed with errors, retrying"
                     task.retry += 1
                     task.status = JobSchedule.STATUS_SUSPENDED

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/simplyblock_core/services/tasks_runner_new_dev_migration.py

@@ -93,7 +93,7 @@ def task_runner(task):
             res_data = res[0]
             migration_status = res_data["status"]
             if migration_status == "completed":
-                if res_data['error'] == 1:
+                if res_data['error'] != 0:
                     task.function_result = "mig completed with errors, retrying"
                     task.retry += 1
                     task.status = JobSchedule.STATUS_SUSPENDED

{sbcli_dev-5.2.7 → sbcli_dev-5.2.9}/simplyblock_core/storage_node_ops.py

@@ -700,7 +700,7 @@ def _prepare_cluster_devices_on_restart(snode):
 
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
-        snode.rpc_username, snode.rpc_password)
+        snode.rpc_username, snode.rpc_password, timeout=5*60)
 
     for index, nvme in enumerate(snode.nvme_devices):
         if nvme.status == NVMeDevice.STATUS_JM:
@@ -1817,7 +1817,8 @@ def restart_storage_node(
         ret = _prepare_cluster_devices_on_restart(snode)
         if not ret:
             logger.error("Failed to prepare cluster devices")
-            # return False
+            return False
+
         snode.write_to_db(kv_store)
 
     logger.info("Connecting to remote devices")
@@ -2721,12 +2722,12 @@ def recreate_lvstore(snode):
     ret = temp_rpc_client.bdev_examine(snode.raid)
     time.sleep(5)
     ret = temp_rpc_client.bdev_wait_for_examine()
-    time.sleep(1)
+    time.sleep(3)
 
     if snode.lvols:
         db_controller = DBController()
         for lvol_id in snode.lvols:
-            time.sleep(5)
+            # time.sleep(1)
             lvol = lvol_controller.recreate_lvol(lvol_id, snode)
             if not lvol:
                 logger.error(f"Failed to recreate LVol: {lvol_id}")