sbcli-dev 6.1.6__tar.gz → 6.1.7__tar.gz

{sbcli_dev-6.1.6 → sbcli_dev-6.1.7}/PKG-INFO

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

{sbcli_dev-6.1.6 → sbcli_dev-6.1.7}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=6.1.6
+SIMPLY_BLOCK_VERSION=6.1.7
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-6.1.6 → sbcli_dev-6.1.7}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.1.6 → sbcli_dev-6.1.7}/simplyblock_core/controllers/tasks_controller.py

@@ -207,10 +207,13 @@ def get_active_node_task(cluster_id, node_id):
     return False
 
 
-def get_new_device_mig_task(cluster_id, node_id, distr_name):
+def get_new_device_mig_task(cluster_id, node_id, distr_name, dev_id=None):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
         if task.function_name == JobSchedule.FN_NEW_DEV_MIG and task.node_id == node_id:
+            if dev_id:
+                if task.device_id != dev_id:
+                    continue
             if task.status != JobSchedule.STATUS_DONE and task.canceled is False \
                     and "distr_name" in task.function_params and task.function_params["distr_name"] == distr_name:
                 return task.uuid

{sbcli_dev-6.1.6 → sbcli_dev-6.1.7}/simplyblock_core/services/storage_node_monitor.py

@@ -72,10 +72,12 @@ def get_cluster_target_status(cluster_id):
 
 
 def is_new_migrated_node(cluster_id, node):
-    for item in node.lvstore_stack:
-        if item["type"] == "bdev_distr":
-            if tasks_controller.get_new_device_mig_task(cluster_id, node.uuid, item["name"]):
-                return True
+    for dev in node.nvme_devices:
+        if dev.status == NVMeDevice.STATUS_ONLINE:
+            for item in node.lvstore_stack:
+                if item["type"] == "bdev_distr":
+                    if tasks_controller.get_new_device_mig_task(cluster_id, node.uuid, item["name"],dev.get_id()):
+                        return True
     return False
 
 
@@ -96,6 +98,9 @@ def get_current_cluster_status(cluster_id):
         node_online_devices = 0
         node_offline_devices = 0
 
+        if node.status == StorageNode.STATUS_IN_CREATION:
+            continue
+
         if node.status == StorageNode.STATUS_ONLINE:
             if is_new_migrated_node(cluster_id, node):
                 continue
@@ -161,7 +166,8 @@ def get_current_cluster_status(cluster_id):
 def update_cluster_status(cluster_id):
     cluster = db_controller.get_cluster_by_id(cluster_id)
 
-    if cluster.status == Cluster.STATUS_READONLY or cluster.status == Cluster.STATUS_UNREADY:
+    if cluster.status == Cluster.STATUS_READONLY or cluster.status == Cluster.STATUS_UNREADY \
+            or Cluster.STATUS_IN_ACTIVATION:
         return
     cluster_current_status = get_current_cluster_status(cluster_id)
     logger.info("cluster_status: %s", cluster.status)