sbcli-pre 25.3.4__tar.gz → 25.3.6__tar.gz

{sbcli-pre-25.3.4 → sbcli-pre-25.3.6}/PKG-INFO

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

{sbcli-pre-25.3.4 → sbcli-pre-25.3.6}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.3.4 → sbcli-pre-25.3.6}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.3.4
+SIMPLY_BLOCK_VERSION=25.3.6
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:R25.3-PRE-Hotfix
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:R25.3-PRE-latest

{sbcli-pre-25.3.4 → sbcli-pre-25.3.6}/simplyblock_core/storage_node_ops.py

@@ -1953,31 +1953,37 @@ def restart_storage_node(
         device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
 
     cluster = db_controller.get_cluster_by_id(snode.cluster_id)
-    if cluster.status in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED, Cluster.STATUS_READONLY]:
+    if cluster.status not in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED, Cluster.STATUS_READONLY]:
+        logger.info("Cluster is not ready yet")
+        logger.info("Setting node status to Online")
+        set_node_status(node_id, StorageNode.STATUS_ONLINE, reconnect_on_online=False)
+        return True
+
+    else:
         snode = db_controller.get_storage_node_by_id(snode.get_id())
+        logger.info("Recreate lvstore")
         ret = recreate_lvstore(snode)
+        snode = db_controller.get_storage_node_by_id(snode.get_id())
         if not ret:
             logger.error("Failed to recreate lvstore")
             snode.lvstore_status = "failed"
             snode.write_to_db()
+            logger.info("Suspending node")
+            set_node_status(snode.get_id(), StorageNode.STATUS_SUSPENDED)
             return False
         else:
             snode.lvstore_status = "ready"
             snode.write_to_db()
 
             logger.info("Setting node status to Online")
-            set_node_status(node_id, StorageNode.STATUS_ONLINE, reconnect_on_online=False)
+            set_node_status(snode.get_id(), StorageNode.STATUS_ONLINE)
 
-            if cluster.status in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED, Cluster.STATUS_READONLY]:
-                for dev in snode.nvme_devices:
-                    if dev.status == NVMeDevice.STATUS_ONLINE:
-                        logger.info(f"Starting migration task for device {dev.get_id()}")
-                        tasks_controller.add_device_mig_task(dev.get_id())
+            for dev in snode.nvme_devices:
+                if dev.status == NVMeDevice.STATUS_ONLINE:
+                    logger.info(f"Starting migration task for device {dev.get_id()}")
+                    tasks_controller.add_device_mig_task(dev.get_id())
             return True
 
-    logger.info("Done")
-    return True
-
 
 def list_storage_nodes(is_json, cluster_id=None):
     db_controller = DBController()
@@ -2871,7 +2877,10 @@ def recreate_lvstore_on_sec(snode):
         node.lvstore_status = "in_creation"
         node.write_to_db()
 
-        lvol_list = db_controller.get_lvols_by_node_id(node.get_id())
+        lvol_list = []
+        for lv in db_controller.get_lvols_by_node_id(node.get_id()):
+            if lv.status not in [LVol.STATUS_IN_DELETION, LVol.STATUS_IN_CREATION]:
+                lvol_list.append(lv)
 
         ret, err = _create_bdev_stack(snode, node.lvstore_stack, primary_node=node)
         if err:
@@ -2885,7 +2894,7 @@ def recreate_lvstore_on_sec(snode):
 
         for lvol in lvol_list:
             logger.info("creating subsystem %s", lvol.nqn)
-            rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, 1000)
+            rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, 1000)
             # for iface in snode.data_nics:
                 # if iface.ip4_address:
                 #     tr_type = iface.get_transport_type()
@@ -2954,7 +2963,10 @@ def recreate_lvstore(snode):
     sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
     sec_node_api = SNodeClient(sec_node.api_endpoint)
 
-    lvol_list = db_controller.get_lvols_by_node_id(snode.get_id())
+    lvol_list = []
+    for lv in db_controller.get_lvols_by_node_id(snode.get_id()):
+        if lv.status not in [LVol.STATUS_IN_DELETION, LVol.STATUS_IN_CREATION]:
+            lvol_list.append(lv)
 
     prim_node_suspend = False
     if sec_node:
@@ -2970,7 +2982,7 @@ def recreate_lvstore(snode):
 
     for lvol in lvol_list:
         logger.info("creating subsystem %s", lvol.nqn)
-        rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, 1)
+        rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, 1)
         # for iface in snode.data_nics:
         #     if iface.ip4_address:
         #         tr_type = iface.get_transport_type()