sbcli-dev 5.1.1__zip → 5.1.3__zip

{sbcli_dev-5.1.1 → sbcli_dev-5.1.3}/PKG-INFO

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

{sbcli_dev-5.1.1 → sbcli_dev-5.1.3}/env_var

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

{sbcli_dev-5.1.1 → sbcli_dev-5.1.3}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.1.1 → sbcli_dev-5.1.3}/simplyblock_core/controllers/tasks_events.py

@@ -16,7 +16,7 @@ def _task_event(task, message, caused_by, event):
         db_object=task,
         caused_by=caused_by,
         message=message,
-        node_id=task.node_id,
+        node_id=task.uuid,
         status=task.status)
 
 

{sbcli_dev-5.1.1 → sbcli_dev-5.1.3}/simplyblock_core/services/tasks_runner_node_add.py

@@ -34,6 +34,7 @@ while True:
                             task.function_result = "canceled"
                             task.status = JobSchedule.STATUS_DONE
                             task.write_to_db(db_controller.kv_store)
+                            tasks_events.task_updated(task)
                             continue
 
                         if task.status != JobSchedule.STATUS_RUNNING:
@@ -46,5 +47,6 @@ while True:
                         task.function_result = str(res)
                         task.status = JobSchedule.STATUS_DONE
                         task.write_to_db(db_controller.kv_store)
+                        tasks_events.task_updated(task)
 
     time.sleep(3)

{sbcli_dev-5.1.1 → sbcli_dev-5.1.3}/simplyblock_core/storage_node_ops.py

@@ -562,13 +562,17 @@ def _prepare_cluster_devices_partitions(snode, devices):
             continue
 
         if nvme.is_partition:
-            partitioned_devices = [nvme]
-
             dev_part = f"{nvme.nvme_bdev[:-2]}p1"
             if dev_part in bdevs_names:
                 if dev_part not in jm_devices:
                     jm_devices.append(dev_part)
 
+            new_device = _create_storage_device_stack(rpc_client, nvme, snode, after_restart=True)
+            if not new_device:
+                logger.error("failed to create dev stack")
+                return False
+            new_devices.append(new_device)
+
         else:
             # look for partitions
             partitioned_devices = _search_for_partitions(rpc_client, nvme)
@@ -588,19 +592,19 @@ def _prepare_cluster_devices_partitions(snode, devices):
 
             jm_devices.append(partitioned_devices.pop(0).nvme_bdev)
 
-        for dev in partitioned_devices:
-            new_device = _create_storage_device_stack(rpc_client, dev, snode, after_restart=False)
-            if not new_device:
-                logger.error("failed to create dev stack")
-                return False
-            if nvme.status == NVMeDevice.STATUS_NEW:
-                new_device.status = NVMeDevice.STATUS_NEW
-            else:
-                new_device.status = NVMeDevice.STATUS_ONLINE
-                new_device.cluster_device_order = dev_order
-                dev_order += 1
-                device_events.device_create(new_device)
-            new_devices.append(new_device)
+            for dev in partitioned_devices:
+                new_device = _create_storage_device_stack(rpc_client, dev, snode, after_restart=False)
+                if not new_device:
+                    logger.error("failed to create dev stack")
+                    return False
+                if nvme.status == NVMeDevice.STATUS_NEW:
+                    new_device.status = NVMeDevice.STATUS_NEW
+                else:
+                    new_device.status = NVMeDevice.STATUS_ONLINE
+                    new_device.cluster_device_order = dev_order
+                    dev_order += 1
+                    device_events.device_create(new_device)
+                new_devices.append(new_device)
 
     snode.nvme_devices = new_devices
 
@@ -653,11 +657,17 @@ def _prepare_cluster_devices_jm_on_dev(snode, devices):
 def _prepare_cluster_devices_on_restart(snode):
     db_controller = DBController()
 
+    new_devices = []
+
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
         snode.rpc_username, snode.rpc_password)
 
     for index, nvme in enumerate(snode.nvme_devices):
+        if nvme.status == NVMeDevice.STATUS_JM:
+            continue
+
+        new_devices.append(nvme)
 
         if nvme.status not in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_UNAVAILABLE,
                                NVMeDevice.STATUS_READONLY, NVMeDevice.STATUS_NEW]:
@@ -671,6 +681,9 @@ def _prepare_cluster_devices_on_restart(snode):
         if nvme.status == NVMeDevice.STATUS_ONLINE:
             device_events.device_restarted(dev)
 
+    snode.nvme_devices = new_devices
+    snode.write_to_db()
+
     # prepare JM device
     jm_device = snode.jm_device
     if jm_device is None or jm_device.status == JMDevice.STATUS_REMOVED:
@@ -1976,8 +1989,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:
-            logger.info("Removing JM")
-            device_controller.remove_jm_device(snode.jm_device.get_id(), force=True)
+            logger.info("Setting JM unavailable")
+            device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_UNAVAILABLE)
 
     for dev in snode.nvme_devices:
         if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_READONLY]: