sbcli-pre 1.2.2__zip → 1.2.4__zip

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/PKG-INFO

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

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.2.2
+SIMPLY_BLOCK_VERSION=1.2.4
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/simplyblock_cli/cli.py

@@ -41,7 +41,7 @@ class CLIWrapper:
         sub_command.add_argument("ifname", help='Management interface name')
         sub_command.add_argument("--partitions", help='Number of partitions to create per device', type=int, default=0)
         sub_command.add_argument("--jm-percent", help='Number in percent to use for JM from each device',
-                                 type=int, default=0, dest='jm_percent')
+                                 type=int, default=3, dest='jm_percent')
         sub_command.add_argument("--data-nics", help='Data interface names', nargs='+', dest='data_nics')
         sub_command.add_argument("--memory", help='SPDK huge memory allocation, default is 4G', dest='spdk_mem')
         sub_command.add_argument("--spdk-image", help='SPDK image uri', dest='spdk_image')

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/simplyblock_core/controllers/lvol_controller.py

@@ -696,6 +696,9 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
         lvol.top_bdev = lvol.comp_bdev
 
     nodes = _get_next_3_nodes(cl.get_id())
+    if not nodes:
+        return False, f"No nodes found with enough resources to create the LVol"
+
     if host_node:
         nodes.insert(0, host_node)
     else:
@@ -1367,8 +1370,12 @@ def migrate(lvol_id, node_id):
         logger.error(f"lvol not found: {lvol_id}")
         return False
 
-    old_node = lvol.node_id
-    nodes = _get_next_3_nodes()
+    old_node_id = lvol.node_id
+    old_node = db_controller.get_storage_node_by_id(old_node_id)
+    nodes = _get_next_3_nodes(old_node.cluster_id)
+    if not nodes:
+        logger.error(f"No nodes found with enough resources to create the LVol")
+        return False
 
     if node_id:
         nodes[0] = db_controller.get_storage_node_by_id(node_id)
@@ -1402,7 +1409,7 @@ def migrate(lvol_id, node_id):
     host_node.write_to_db(db_controller.kv_store)
     lvol.write_to_db(db_controller.kv_store)
 
-    lvol_events.lvol_migrate(lvol, old_node, lvol.node_id)
+    lvol_events.lvol_migrate(lvol, old_node_id, lvol.node_id)
 
     return True
 

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/simplyblock_core/services/device_monitor.py

@@ -48,9 +48,9 @@ while True:
                 logger.info("Adding device to auto restart")
                 auto_restart_devices.append(dev)
 
-        if len(auto_restart_devices) == 1:
-            tasks_controller.add_device_to_auto_restart(auto_restart_devices[0])
-        elif len(auto_restart_devices) >= 2 and len(online_devices) == 0:
+        if len(auto_restart_devices) >= 2 or len(online_devices) == 0:
             tasks_controller.add_node_to_auto_restart(node)
+        elif len(auto_restart_devices) == 1:
+            tasks_controller.add_device_to_auto_restart(auto_restart_devices[0])
 
     time.sleep(constants.DEV_MONITOR_INTERVAL_SEC)

{sbcli_pre-1.2.2 → sbcli_pre-1.2.4}/simplyblock_core/services/tasks_runner_restart.py

@@ -208,6 +208,8 @@ while True:
                 delay_seconds = constants.TASK_EXEC_INTERVAL_SEC
                 if task.function_name in [JobSchedule.FN_DEV_RESTART, JobSchedule.FN_NODE_RESTART]:
                     while task.status != JobSchedule.STATUS_DONE:
+                        # get new task object because it could be changed from cancel task
+                        task = db_controller.get_task_by_id(task.get_id())
                         res = task_runner(task)
                         if res:
                             tasks_events.task_updated(task)