sbcli-dev 4.0.1__zip → 4.0.3__zip

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/PKG-INFO

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

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/env_var

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

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/simplyblock_core/controllers/lvol_controller.py

@@ -575,7 +575,7 @@ def _create_bdev_stack(lvol, snode, ha_comm_addrs, ha_inode_self):
                 ret = distr_controller.send_cluster_map_to_node(snode)
                 if not ret:
                     return False, "Failed to send cluster map"
-                time.sleep(3)
+                # time.sleep(3)
 
         elif type == "bmap_init":
             ret = rpc_client.ultra21_lvol_bmap_init(**params)

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/simplyblock_core/controllers/tasks_controller.py

@@ -47,6 +47,11 @@ def _add_task(function_name, cluster_id, node_id, device_id,
         if task_id:
             logger.info(f"Task found, skip adding new task: {task_id}")
             return False
+    elif function_name == JobSchedule.FN_NEW_DEV_MIG:
+        task_id = get_new_device_mig_task(cluster_id, node_id, function_params['distr_name'])
+        if task_id:
+            logger.info(f"Task found, skip adding new task: {task_id}")
+            return False
 
     task_obj = JobSchedule()
     task_obj.uuid = str(uuid.uuid4())
@@ -186,3 +191,12 @@ def get_active_node_task(cluster_id, node_id):
             if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
                 return task.uuid
     return False
+
+def get_new_device_mig_task(cluster_id, node_id, distr_name):
+    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 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
+    return False

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/simplyblock_core/distr_controller.py

@@ -31,7 +31,7 @@ def send_node_status_event(node, node_status):
         ret = rpc_client.distr_status_events_update(events)
 
 
-def send_dev_status_event(device, dev_status):
+def send_dev_status_event(device, dev_status, target_node=None):
     db_controller = DBController()
     storage_ID = device.cluster_device_order
     node_status_event = {
@@ -41,7 +41,10 @@ def send_dev_status_event(device, dev_status):
         "status": dev_status}
     events = {"events": [node_status_event]}
     logger.debug(node_status_event)
-    snodes = db_controller.get_storage_nodes_by_cluster_id(device.cluster_id)
+    if target_node:
+        snodes = [target_node]
+    else:
+        snodes = db_controller.get_storage_nodes_by_cluster_id(device.cluster_id)
     for node in snodes:
         if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:
             continue

{sbcli_dev-4.0.1 → sbcli_dev-4.0.3}/simplyblock_core/storage_node_ops.py

@@ -778,6 +778,7 @@ def _connect_to_remote_devs(this_node):
                     continue
             dev.remote_bdev = bdev_name
             remote_devices.append(dev)
+            distr_controller.send_dev_status_event(dev, dev.status, node)
     return remote_devices
 
 
@@ -1683,10 +1684,6 @@ def restart_storage_node(
         logger.info("Connecting to remote JMs")
         snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
 
-    logger.info(f"Sending device status event")
-    for dev in snode.nvme_devices:
-        distr_controller.send_dev_status_event(dev, dev.status)
-
     logger.info("Setting node status to Online")
     set_node_status(node_id, StorageNode.STATUS_ONLINE)
 
@@ -1701,6 +1698,9 @@ def restart_storage_node(
             node.remote_jm_devices = _connect_to_remote_jm_devs(node)
         node.write_to_db(kv_store)
 
+    logger.info(f"Sending device status event")
+    for dev in snode.nvme_devices:
+        distr_controller.send_dev_status_event(dev, dev.status)
 
     logger.info("Starting migration tasks")
     for dev in snode.nvme_devices:
@@ -2658,7 +2658,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     snode.lvstore_stack = lvstore_stack
     snode.raid = raid_device
     snode.write_to_db()
-    time.sleep(1)
+    # time.sleep(1)
     return True