sbcli-dev 3.8.70__zip → 3.8.72__zip

{sbcli_dev-3.8.70 → sbcli_dev-3.8.72}/PKG-INFO

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

{sbcli_dev-3.8.70 → sbcli_dev-3.8.72}/env_var

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

{sbcli_dev-3.8.70 → sbcli_dev-3.8.72}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.70 → sbcli_dev-3.8.72}/simplyblock_cli/cli.py

@@ -145,12 +145,12 @@ class CLIWrapper:
             'io_error_on_unmap', 'io_error_on_all', 'discard_io_all',
             'hotplug_removal'], default='full_pass_through')
 
-        sub_command = self.add_sub_command(subparser, "jm-device-testing-mode", 'Set device testing mode')
-        sub_command.add_argument("device_id", help='Device UUID')
-        sub_command.add_argument("mode", help='Testing mode', choices=[
-            'full_pass_through', 'io_error_on_read', 'io_error_on_write',
-            'io_error_on_unmap', 'io_error_on_all', 'discard_io_all',
-            'hotplug_removal'], default='full_pass_through')
+        # sub_command = self.add_sub_command(subparser, "jm-device-testing-mode", 'Set device testing mode')
+        # sub_command.add_argument("device_id", help='Device UUID')
+        # sub_command.add_argument("mode", help='Testing mode', choices=[
+        #     'full_pass_through', 'io_error_on_read', 'io_error_on_write',
+        #     'io_error_on_unmap', 'io_error_on_all', 'discard_io_all',
+        #     'hotplug_removal'], default='full_pass_through')
 
         sub_command = self.add_sub_command(subparser, "get-device", 'Get storage device by id')
         sub_command.add_argument("device_id", help='the devices\'s UUID')
@@ -791,8 +791,8 @@ class CLIWrapper:
 
             elif sub_command == "device-testing-mode":
                 ret = device_controller.set_device_testing_mode(args.device_id, args.mode)
-            elif sub_command == "jm-device-testing-mode":
-                ret = device_controller.set_jm_device_testing_mode(args.device_id, args.mode)
+            # elif sub_command == "jm-device-testing-mode":
+            #     ret = device_controller.set_jm_device_testing_mode(args.device_id, args.mode)
 
             elif sub_command == "remove-device":
                 ret = device_controller.device_remove(args.device_id, args.force)

{sbcli_dev-3.8.70 → sbcli_dev-3.8.72}/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.70 → sbcli_dev-3.8.72}/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
 
@@ -295,26 +295,26 @@ def set_device_testing_mode(device_id, mode):
     return ret
 
 
-def set_jm_device_testing_mode(device_id, mode):
-    db_controller = DBController()
-    snode = db_controller.get_storage_by_jm_id(device_id)
-    if not snode:
-        logger.error("node not found")
-        return False
-    jm_device = snode.jm_device
-
-    if not snode.enable_test_device:
-        logger.error("Test device is disabled on this storage node")
-        return False
-
-    logger.info(f"Set device:{device_id} Test mode:{mode}")
-    # creating RPCClient instance
-    rpc_client = RPCClient(
-        snode.mgmt_ip, snode.rpc_port,
-        snode.rpc_username, snode.rpc_password)
-
-    ret = rpc_client.bdev_passtest_mode(jm_device.testing_bdev, mode)
-    return ret
+# def set_jm_device_testing_mode(device_id, mode):
+#     db_controller = DBController()
+#     snode = db_controller.get_storage_by_jm_id(device_id)
+#     if not snode:
+#         logger.error("node not found")
+#         return False
+#     jm_device = snode.jm_device
+#
+#     if not snode.enable_test_device:
+#         logger.error("Test device is disabled on this storage node")
+#         return False
+#
+#     logger.info(f"Set device:{device_id} Test mode:{mode}")
+#     # creating RPCClient instance
+#     rpc_client = RPCClient(
+#         snode.mgmt_ip, snode.rpc_port,
+#         snode.rpc_username, snode.rpc_password)
+#
+#     ret = rpc_client.bdev_passtest_mode(jm_device.testing_bdev, mode)
+#     return ret
 
 
 def device_remove(device_id, force=True):

{sbcli_dev-3.8.70 → sbcli_dev-3.8.72}/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.70 → sbcli_dev-3.8.72}/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.70 → sbcli_dev-3.8.72}/simplyblock_core/storage_node_ops.py

@@ -256,7 +256,7 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
     alceml_name = f"alceml_jm_{snode.get_id()}"
 
     nvme_bdev = raid_bdev
-    # test_name = ""
+    test_name = ""
     # if snode.enable_test_device:
     #     test_name = f"{raid_bdev}_test"
     #     ret = rpc_client.bdev_passtest_create(test_name, raid_bdev)
@@ -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