sbcli-dev 4.0.30__zip → 4.0.32__zip

{sbcli_dev-4.0.30 → sbcli_dev-4.0.32}/PKG-INFO

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

{sbcli_dev-4.0.30 → sbcli_dev-4.0.32}/env_var

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

{sbcli_dev-4.0.30 → sbcli_dev-4.0.32}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.30 → sbcli_dev-4.0.32}/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)
@@ -1070,6 +1076,10 @@ def resize_lvol(id, new_size):
         logger.error(f"New size {new_size} must be smaller than the max size {lvol.max_size}")
         return False
 
+    if lvol.cloned_from_snap:
+        logger.error(f"Can not resize clone!")
+        return False
+
     logger.info(f"Resizing LVol: {lvol.id}, new size: {new_size}")
 
     snode = db_controller.get_storage_node_by_id(lvol.node_id)

{sbcli_dev-4.0.30 → sbcli_dev-4.0.32}/simplyblock_core/controllers/snapshot_controller.py

@@ -270,17 +270,17 @@ def clone(snapshot_id, clone_name, new_size=0):
         }
     ]
 
-    if new_size:
-        if snap.lvol.size >= new_size:
-            msg = f"New size {new_size} must be higher than the original size {snap.lvol.size}"
-            logger.error(msg)
-            return False, msg
-
-        if snap.lvol.max_size < new_size:
-            msg = f"New size {new_size} must be smaller than the max size {snap.lvol.max_size}"
-            logger.error(msg)
-            return False, msg
-        lvol.size = new_size
+    # if new_size:
+    #     if snap.lvol.size >= new_size:
+    #         msg = f"New size {new_size} must be higher than the original size {snap.lvol.size}"
+    #         logger.error(msg)
+    #         return False, msg
+    #
+    #     if snap.lvol.max_size < new_size:
+    #         msg = f"New size {new_size} must be smaller than the max size {snap.lvol.max_size}"
+    #         logger.error(msg)
+    #         return False, msg
+    #     lvol.size = new_size
 
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
     spdk_mem_info_before = rpc_client.ultra21_util_get_malloc_stats()
@@ -346,6 +346,6 @@ def clone(snapshot_id, clone_name, new_size=0):
 
     logger.info("Done")
     snapshot_events.snapshot_clone(snap, lvol)
-    if new_size:
-        lvol_controller.resize_lvol(lvol.get_id(), new_size)
+    # if new_size:
+    #     lvol_controller.resize_lvol(lvol.get_id(), new_size)
     return True, lvol.uuid

{sbcli_dev-4.0.30 → sbcli_dev-4.0.32}/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.30 → sbcli_dev-4.0.32}/simplyblock_core/storage_node_ops.py

@@ -2598,8 +2598,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