sbcli-dev 4.0.31__zip → 4.0.33__zip

{sbcli_dev-4.0.31 → sbcli_dev-4.0.33}/PKG-INFO

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

{sbcli_dev-4.0.31 → sbcli_dev-4.0.33}/env_var

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

{sbcli_dev-4.0.31 → sbcli_dev-4.0.33}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.31 → sbcli_dev-4.0.33}/simplyblock_core/controllers/lvol_controller.py

@@ -685,6 +685,12 @@ def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=None):
 def recreate_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=None):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
+    if "crypto" in lvol.lvol_type:
+        ret = _create_crypto_lvol(
+            rpc_client, lvol.crypto_bdev, f"{lvol.lvs_name}/{lvol.lvol_bdev}", lvol.crypto_key1, lvol.crypto_key2)
+        if not ret:
+            return False, "Failed to create crypto bdev"
+
     logger.info("creating subsystem %s", lvol.nqn)
     ret = rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid)
     logger.debug(ret)

{sbcli_dev-4.0.31 → sbcli_dev-4.0.33}/simplyblock_core/services/tasks_runner_restart.py

@@ -141,6 +141,13 @@ def task_runner_node(task):
         task.write_to_db(db_controller.kv_store)
         return True
 
+    if node.status == StorageNode.STATUS_RESTARTING:
+        logger.info(f"Node is restarting, stopping task")
+        task.function_result = f"Node is restarting"
+        task.status = JobSchedule.STATUS_DONE
+        task.write_to_db(db_controller.kv_store)
+        return True
+
     if _get_node_unavailable_devices_count(node.get_id()) == 0 and node.status == StorageNode.STATUS_ONLINE:
         logger.info(f"Node is online: {node.get_id()}")
         task.function_result = "Node is online"

{sbcli_dev-4.0.31 → sbcli_dev-4.0.33}/simplyblock_core/storage_node_ops.py

@@ -629,12 +629,13 @@ def _prepare_cluster_devices_jm_on_dev(snode, devices):
             if not new_device:
                 logger.error("failed to create dev stack")
                 return False
-            new_device.cluster_device_order = dev_order
-            dev_order += 1
+            if nvme.status == NVMeDevice.STATUS_NEW:
+                new_device.status = NVMeDevice.STATUS_NEW
+            else:
+                new_device.cluster_device_order = dev_order
+                dev_order += 1
+                device_events.device_create(new_device)
             new_devices.append(new_device)
-            device_events.device_create(new_device)
-
-        device_events.device_create(nvme)
 
     snode.nvme_devices = new_devices
     return True
@@ -2598,8 +2599,8 @@ def recreate_lvstore(snode):
         for lvol_id in snode.lvols:
             lvol = lvol_controller.recreate_lvol(lvol_id, snode)
             if not lvol:
-                logger.error(f"Failed to create LVol: {lvol_id}")
-                return False
+                logger.error(f"Failed to recreate LVol: {lvol_id}")
+                continue
             lvol.status = lvol.STATUS_ONLINE
             lvol.io_error = False
             lvol.health_check = True