sbcli-dev 17.4.4__tar.gz → 17.4.6__tar.gz

{sbcli_dev-17.4.4 → sbcli_dev-17.4.6}/PKG-INFO

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

{sbcli_dev-17.4.4 → sbcli_dev-17.4.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-17.4.4 → sbcli_dev-17.4.6}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.4.4
+SIMPLY_BLOCK_VERSION=17.4.6
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-17.4.4 → sbcli_dev-17.4.6}/simplyblock_core/rpc_client.py

@@ -1026,3 +1026,10 @@ class RPCClient:
             "uuid" if utils.UUID_PATTERN.match(lvs) else "lvs_name": lvs,
             "remote_bdev": bdev,
         })
+
+    def jc_suspend_compression(self, jm_vuid, suspend=False):
+        params = {
+            "jm_vuid": jm_vuid,
+            "suspend": suspend,
+        }
+        return self._request("jc_suspend_compression", params)

{sbcli_dev-17.4.4 → sbcli_dev-17.4.6}/simplyblock_core/services/tasks_runner_migration.py

@@ -133,15 +133,21 @@ while True:
                         if active_task:
                             logger.info("task found on same node, retry")
                             continue
-
-                        res = task_runner(task)
-                        if res:
-                            tasks_events.task_updated(task)
-
                     elif task.status == JobSchedule.STATUS_RUNNING:
-
-                        res = task_runner(task)
-                        if res:
-                            tasks_events.task_updated(task)
+                        pass
+
+                    res = task_runner(task)
+                    if res:
+                        tasks_events.task_updated(task)
+
+                        node_task = tasks_controller.get_active_node_tasks(task.cluster_id, task.node_id)
+                        if not node_task:
+                            logger.info("no task found on same node, resuming compression")
+                            node = db_controller.get_storage_node_by_id(task.node_id)
+                            rpc_client = RPCClient(
+                                node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password, timeout=5, retry=2)
+                            ret = rpc_client.jc_suspend_compression(jm_vuid=node.jm_vuid, suspend=False)
+                            if not ret:
+                                logger.error("Failed to resume JC compression")
 
     time.sleep(3)

{sbcli_dev-17.4.4 → sbcli_dev-17.4.6}/simplyblock_core/storage_node_ops.py

@@ -920,6 +920,8 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
                         break
 
         free_cores = list(set(total_spdk_cores) - set(used_cores))
+        if not spdk_cpu_count:
+            spdk_cpu_count = free_cores
         if len(free_cores) >= spdk_cpu_count:
             spdk_cpu_mask = utils.generate_mask(free_cores[:spdk_cpu_count])
         else:
@@ -2977,6 +2979,13 @@ def recreate_lvstore(snode):
 
     ### 6- wait for examine
     ret = rpc_client.bdev_wait_for_examine()
+
+    logger.info("Suspending JC compression")
+    ret = rpc_client.jc_suspend_compression(jm_vuid=snode.jm_vuid, suspend=True)
+    if not ret:
+        logger.error("Failed to suspend JC compression")
+        # return False
+
     ret = rpc_client.bdev_lvol_set_lvs_opts(
             snode.lvstore,
             groupid=snode.jm_vuid,