sbcli-dev 3.8.71__zip → 3.8.73__zip

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/PKG-INFO

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

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/env_var

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

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/simplyblock_core/constants.py

@@ -11,7 +11,7 @@ LOG_WEB_DEBUG = True
 
 INSTALL_DIR = os.path.dirname(os.path.realpath(__file__))
 
-NODE_MONITOR_INTERVAL_SEC = 10
+NODE_MONITOR_INTERVAL_SEC = 5
 DEVICE_MONITOR_INTERVAL_SEC = 5
 STAT_COLLECTOR_INTERVAL_SEC = 60*5  # 5 minutes
 LVOL_STAT_COLLECTOR_INTERVAL_SEC = 5

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/simplyblock_core/controllers/device_controller.py

@@ -37,8 +37,8 @@ def device_set_state(device_id, state):
 
     old_status = dev.status
     device.status = state
-    distr_controller.send_dev_status_event(device, device.status)
     snode.write_to_db(db_controller.kv_store)
+    distr_controller.send_dev_status_event(device, device.status)
     device_events.device_status_change(device, device.status, old_status)
     return True
 
@@ -690,14 +690,21 @@ def add_device(device_id):
 
     tasks_controller.add_new_device_mig_task(device_id)
 
-    # add device to jm raid
-    if snode.jm_device.raid_bdev and snode.jm_device.jm_nvme_bdev_list < 2:
-        nvme_bdev = jm_part.nvme_bdev
-        if nvme_bdev not in snode.jm_device.jm_nvme_bdev_list:
-            ret = rpc_client.bdev_raid_add_base_bdev(snode.jm_device.raid_bdev, nvme_bdev)
-            if ret:
-                snode.jm_device.jm_nvme_bdev_list.append(nvme_bdev)
-                snode.write_to_db(db_controller.kv_store)
+    # add to jm raid
+    if snode.jm_device and snode.jm_device.raid_bdev:
+        # looking for jm partition
+        rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        jm_dev_part = f"{dev.nvme_bdev[:-1]}1"
+        ret = rpc_client.get_bdevs(jm_dev_part)
+        if ret:
+            logger.info(f"JM part found: {jm_dev_part}")
+            if snode.jm_device.status == JMDevice.STATUS_UNAVAILABLE:
+                restart_jm_device(snode.jm_device.get_id(), force=True)
+
+            if snode.jm_device.status == JMDevice.STATUS_ONLINE and \
+                    jm_dev_part not in snode.jm_device.jm_nvme_bdev_list:
+                remove_jm_device(snode.jm_device.get_id(), force=True)
+                restart_jm_device(snode.jm_device.get_id(), force=True)
 
     return "Done"
 

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/simplyblock_core/controllers/health_controller.py

@@ -82,7 +82,7 @@ def _check_node_rpc(rpc_ip, rpc_port, rpc_username, rpc_password, timeout=5, ret
 
 def _check_node_api(ip):
     try:
-        snode_api = SNodeClient(f"{ip}:5000", timeout=10, retry=2)
+        snode_api = SNodeClient(f"{ip}:5000", timeout=5, retry=2)
         logger.debug(f"Node API={ip}:5000")
         info, _ = snode_api.info()
         if info:
@@ -95,7 +95,7 @@ def _check_node_api(ip):
 
 def _check_spdk_process_up(ip):
     try:
-        snode_api = SNodeClient(f"{ip}:5000", timeout=10, retry=2)
+        snode_api = SNodeClient(f"{ip}:5000", timeout=5, retry=2)
         logger.debug(f"Node API={ip}:5000")
         is_up, _ = snode_api.spdk_process_is_up()
         logger.debug(f"SPDK is {is_up}")

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/simplyblock_core/services/storage_node_monitor.py

@@ -105,9 +105,16 @@ 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)
+
+        # set devices unavailable
         for dev in node.nvme_devices:
             device_controller.device_set_unavailable(dev.get_id())
-        storage_node_ops.set_node_status(snode.get_id(), StorageNode.STATUS_UNREACHABLE)
+
+        # 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)
 
 
 logger.info("Starting node monitor")
@@ -164,8 +171,6 @@ while True:
 
             else:
                 set_node_offline(snode)
-                if snode.jm_device.status != JMDevice.STATUS_UNAVAILABLE:
-                    device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_UNAVAILABLE)
 
                 if not ping_check and not node_api_check and not spdk_process:
                     # restart on new node

{sbcli_dev-3.8.71 → sbcli_dev-3.8.73}/simplyblock_core/storage_node_ops.py

@@ -325,7 +325,7 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
             logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
             return False
 
-    ret = rpc_client.get_bdevs(jm_bdev)
+    ret = rpc_client.get_bdevs(raid_bdev)
 
     return JMDevice({
         'uuid': alceml_id,
@@ -749,7 +749,7 @@ def _connect_to_remote_devs(this_node):
 
     rpc_client = RPCClient(
         this_node.mgmt_ip, this_node.rpc_port,
-        this_node.rpc_username, this_node.rpc_password)
+        this_node.rpc_username, this_node.rpc_password, timeout=5, retry=2)
 
     remote_devices = []
     # connect to remote devs
@@ -783,7 +783,7 @@ def _connect_to_remote_jm_devs(this_node):
 
     rpc_client = RPCClient(
         this_node.mgmt_ip, this_node.rpc_port,
-        this_node.rpc_username, this_node.rpc_password)
+        this_node.rpc_username, this_node.rpc_password, timeout=5, retry=2)
 
     remote_devices = []
     # connect to remote devs