sbcli-dev 4.0.20__zip → 4.0.22__zip

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/PKG-INFO

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

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/env_var

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

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/simplyblock_core/controllers/lvol_controller.py

@@ -167,7 +167,7 @@ def validate_add_lvol_func(name, size, host_id_or_name, pool_id_or_name,
 
 def _get_next_3_nodes(cluster_id, lvol_size=0):
     snodes = db_controller.get_storage_nodes_by_cluster_id(cluster_id)
-    # online_nodes = []
+    online_nodes = []
     node_stats = {}
     for node in snodes:
         if node.status == node.STATUS_ONLINE:
@@ -182,7 +182,7 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
             #     logger.warning(error)
             #     continue
             #
-            # online_nodes.append(node)
+            online_nodes.append(node)
             # node_stat_list = db_controller.get_node_stats(node, limit=1000)
             # combined_record = utils.sum_records(node_stat_list)
             node_st = {
@@ -539,9 +539,11 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
                 return ret, error
         lvol.nodes = nodes_ids
 
+    host_node = db_controller.get_storage_node_by_id(host_node.get_id())
     host_node.lvols.append(lvol.uuid)
     host_node.write_to_db(db_controller.kv_store)
 
+    pool = db_controller.get_pool_by_id(pool.get_id())
     lvol.pool_uuid = pool.id
     pool.lvols.append(lvol.uuid)
     pool.write_to_db(db_controller.kv_store)
@@ -852,11 +854,15 @@ def delete_lvol(id_or_name, force_delete=False):
                 return False
 
     # remove from storage node
+    snode = db_controller.get_storage_node_by_id(lvol.node_id)
+    logger.debug(snode)
+    logger.debug(f"removing lvol: {lvol.get_id()} from node lvol list: {str(snode.lvols)}")
     if lvol.get_id() in snode.lvols:
         snode.lvols.remove(lvol.get_id())
         snode.write_to_db(db_controller.kv_store)
 
     # remove from pool
+    pool = db_controller.get_pool_by_id(lvol.pool_uuid)
     if lvol.get_id() in pool.lvols:
         pool.lvols.remove(lvol.get_id())
         pool.write_to_db(db_controller.kv_store)

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/simplyblock_core/controllers/tasks_controller.py

@@ -193,7 +193,7 @@ def get_active_node_task(cluster_id, node_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
         if task.node_id == node_id:
-            if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
                 return task.uuid
     return False
 

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/simplyblock_core/services/storage_node_monitor.py

@@ -106,8 +106,8 @@ def set_node_online(node):
                 device_controller.device_set_online(dev.get_id())
 
         # set jm dev online
-        if snode.jm_device.status == JMDevice.STATUS_UNAVAILABLE:
-            device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
+        if node.jm_device.status == JMDevice.STATUS_UNAVAILABLE:
+            device_controller.set_jm_device_state(node.jm_device.get_id(), JMDevice.STATUS_ONLINE)
 
         # set node online
         storage_node_ops.set_node_status(node.get_id(), StorageNode.STATUS_ONLINE)
@@ -116,7 +116,7 @@ def set_node_online(node):
 def set_node_offline(node):
     if node.status != StorageNode.STATUS_UNREACHABLE:
         # set node unavailable
-        storage_node_ops.set_node_status(snode.get_id(), StorageNode.STATUS_UNREACHABLE)
+        storage_node_ops.set_node_status(node.get_id(), StorageNode.STATUS_UNREACHABLE)
 
         # set devices unavailable
         for dev in node.nvme_devices:
@@ -124,8 +124,8 @@ def set_node_offline(node):
                 device_controller.device_set_unavailable(dev.get_id())
 
         # set jm dev offline
-        if snode.jm_device.status != JMDevice.STATUS_UNAVAILABLE:
-            device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_UNAVAILABLE)
+        if node.jm_device.status != JMDevice.STATUS_UNAVAILABLE:
+            device_controller.set_jm_device_state(node.jm_device.get_id(), JMDevice.STATUS_UNAVAILABLE)
 
 
 logger.info("Starting node monitor")

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/simplyblock_core/services/tasks_runner_failed_migration.py

@@ -65,10 +65,7 @@ def task_runner(task):
             task.write_to_db(db_controller.kv_store)
             return False
 
-        task.function_params = {
-            "migration": {
-                "name": distr_name}
-        }
+        task.function_params['migration'] = {"name": distr_name}
         task.write_to_db(db_controller.kv_store)
         time.sleep(3)
 

{sbcli_dev-4.0.20 → sbcli_dev-4.0.22}/simplyblock_core/storage_node_ops.py

@@ -1910,9 +1910,8 @@ def shutdown_storage_node(node_id, force=False):
         _remove_bdev_stack(snode.lvstore_stack, rpc_client, remove_distr_only=True)
 
         if snode.jm_device:
-            # delete jm
             logger.info("Removing JM")
-            rpc_client.bdev_jm_delete(snode.jm_device.jm_bdev)
+            device_controller.remove_jm_device(snode.jm_device.get_id(), force=True)
 
     for dev in snode.nvme_devices:
         if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_READONLY]: