sbcli-dev 10.9.0__tar.gz → 10.9.2__tar.gz

{sbcli_dev-10.9.0 → sbcli_dev-10.9.2}/PKG-INFO

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

{sbcli_dev-10.9.0 → sbcli_dev-10.9.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.9.0 → sbcli_dev-10.9.2}/simplyblock_core/cluster_ops.py

@@ -612,8 +612,8 @@ def list_all_info(cluster_id):
     data = []
 
     data.append({
-        "UUID": cl.uuid,
-        "Type": "Cluster Object",
+        "Cluster UUID": cl.uuid,
+        # "Type": "Cluster Object",
         # "Devices": f"{len(devs)}/{len(devs_online)}",
         # "Lvols": f"{len(lvols)}/{len(lv_online)}",
 
@@ -656,8 +656,7 @@ def list_all_info(cluster_id):
                 online_devices += 1
 
         data.append({
-            "UUID": node.uuid,
-            "Type": "Storage",
+            "Storage node UUID": node.uuid,
             "Devices": f"{total_devices}/{online_devices}",
             "LVols": f"{len(lvs)}",
 
@@ -684,8 +683,7 @@ def list_all_info(cluster_id):
                 rec = StatsObject()
 
             dev_data.append({
-                "UUID": dev.uuid,
-                "Type": "Storage Device",
+                "Device UUID": dev.uuid,
 
                 "Size total": f"{utils.humanbytes(rec.size_total)}",
                 "Size Used": f"{utils.humanbytes(rec.size_used)}",
@@ -704,7 +702,7 @@ def list_all_info(cluster_id):
             })
 
     out += "\n"
-    out +=  utils.print_table(data, title="Storage nodes Stats")
+    out +=  utils.print_table(data, title="Storage Nodes Stats")
     out += "\n"
 
     out += "\n"
@@ -720,8 +718,7 @@ def list_all_info(cluster_id):
             rec = StatsObject()
 
         lvol_data.append({
-            "UUID": lvol.uuid,
-            "Type": "LVol",
+            "LVol UUID": lvol.uuid,
 
             "Size prov": f"{utils.humanbytes(rec.size_total)}",
             "Size Used": f"{utils.humanbytes(rec.size_used)}",

{sbcli_dev-10.9.0 → sbcli_dev-10.9.2}/simplyblock_core/env_var

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

{sbcli_dev-10.9.0 → sbcli_dev-10.9.2}/simplyblock_core/storage_node_ops.py

@@ -2319,18 +2319,23 @@ def resume_storage_node(node_id):
     else:
 
         sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
-        if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
-            sec_node_client =  RPCClient(
-                sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=5, retry=1)
-            for lvol in db_controller.get_lvols_by_node_id(snode.get_id()):
-                for iface in sec_node.data_nics:
-                    if iface.ip4_address:
-                        ret = sec_node_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", False, ana="inaccessible")
-            time.sleep(1)
-            sec_node_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
-            sec_node_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
-            time.sleep(1)
+        if sec_node :
+            if sec_node.status == StorageNode.STATUS_UNREACHABLE:
+                logger.error("Secondary node is unreachable, cannot resume primary node")
+                return False
+
+            elif sec_node.status == StorageNode.STATUS_ONLINE:
+                sec_node_client =  RPCClient(
+                    sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=5, retry=1)
+                for lvol in db_controller.get_lvols_by_node_id(snode.get_id()):
+                    for iface in sec_node.data_nics:
+                        if iface.ip4_address:
+                            ret = sec_node_client.nvmf_subsystem_listener_set_ana_state(
+                                lvol.nqn, iface.ip4_address, "4420", False, ana="inaccessible")
+                time.sleep(1)
+                sec_node_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
+                sec_node_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
+                time.sleep(1)
 
         for lvol in db_controller.get_lvols_by_node_id(snode.get_id()):
             for iface in snode.data_nics:
@@ -2823,11 +2828,13 @@ def recreate_lvstore(snode):
     if snode.is_secondary_node:
         return recreate_lvstore_on_sec(snode)
 
-    sec_node = None
+    sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
+    prim_node_suspend = False
     lvol_list = db_controller.get_lvols_by_node_id(snode.get_id())
-    if snode.secondary_node_id:
-        sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
-        if sec_node.status == StorageNode.STATUS_ONLINE:
+    if sec_node:
+        if sec_node.status == StorageNode.STATUS_UNREACHABLE:
+            prim_node_suspend = True
+        elif sec_node.status == StorageNode.STATUS_ONLINE:
             sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
 
             for lvol in lvol_list:
@@ -2868,6 +2875,9 @@ def recreate_lvstore(snode):
 
     time.sleep(2)
 
+    if not lvol_list:
+        prim_node_suspend = False
+
     ret, err = _create_bdev_stack(snode, [], primary_node=snode)
 
     if err:
@@ -2879,13 +2889,18 @@ def recreate_lvstore(snode):
     ret = rpc_client.bdev_wait_for_examine()
     ret = rpc_client.bdev_lvol_set_lvs_groupid(snode.lvstore, snode.jm_vuid)
 
-    if snode.jm_vuid:
-        ret = rpc_client.jc_explicit_synchronization(snode.jm_vuid)
-        logger.info(f"JM Sync res: {ret}")
+    if not prim_node_suspend:
+        if snode.jm_vuid:
+            ret = rpc_client.jc_explicit_synchronization(snode.jm_vuid)
+            logger.info(f"JM Sync res: {ret}")
+
+    lvol_ana_state = "optimized"
+    if prim_node_suspend:
+        lvol_ana_state = "inaccessible"
 
     for lvol in lvol_list:
         lvol_obj = db_controller.get_lvol_by_id(lvol.get_id())
-        is_created, error = lvol_controller.recreate_lvol_on_node(lvol_obj, snode)
+        is_created, error = lvol_controller.recreate_lvol_on_node(lvol_obj, snode, ana_state=lvol_ana_state)
         if error:
             logger.error(f"Failed to recreate LVol: {lvol_obj.get_id()} on node: {snode.get_id()}")
             lvol_obj.status = LVol.STATUS_OFFLINE
@@ -2895,6 +2910,12 @@ def recreate_lvstore(snode):
             lvol_obj.health_check = True
         lvol_obj.write_to_db()
 
+    if prim_node_suspend:
+        set_node_status(snode.get_id(), StorageNode.STATUS_SUSPENDED)
+        logger.info("Node restart interrupted because secondary node is unreachable")
+        logger.info("Node status changed to suspended")
+        return False
+
     if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
         time.sleep(10)
         sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)