sbcli-hmdi 0.0.32__tar.gz → 0.0.34__tar.gz

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.32
+Version: 0.0.34
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/sbcli_hmdi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.32
+Version: 0.0.34
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/simplyblock_cli/cli.py

@@ -265,8 +265,8 @@ class CLIWrapper:
 
         sub_command = self.add_sub_command(subparser, 'create',
                                            'Create an new cluster with this node as mgmt (local run)')
-        sub_command.add_argument(
-            "--blk_size", help='The block size in bytes', type=int, choices=[512, 4096], default=512)
+        # sub_command.add_argument(
+        #     "--blk_size", help='The block size in bytes', type=int, choices=[512, 4096], default=512)
 
         sub_command.add_argument(
             "--page_size", help='The size of a data page in bytes', type=int, default=2097152)
@@ -302,14 +302,14 @@ class CLIWrapper:
                                  default=0, choices=range(128))
         sub_command.add_argument("--max-queue-size", help='The max size the queue will grow', type=int, default=128)
         sub_command.add_argument("--inflight-io-threshold", help='The number of inflight IOs allowed before the IO queuing starts', type=int, default=4)
-        sub_command.add_argument("--enable-qos", help='Enable qos bdev for storage nodes', action='store_true', dest='enable_qos')
+        sub_command.add_argument("--enable-qos", help='Enable qos bdev for storage nodes, true by default', dest='enable_qos', type=bool, defaiult=True)
         sub_command.add_argument("--strict-node-anti-affinity", help='Enable strict node anti affinity for storage nodes', action='store_true')
 
 
 
         # add cluster
         sub_command = self.add_sub_command(subparser, 'add', 'Add new cluster')
-        sub_command.add_argument("--blk_size", help='The block size in bytes', type=int, choices=[512, 4096], default=512)
+        # sub_command.add_argument("--blk_size", help='The block size in bytes', type=int, choices=[512, 4096], default=512)
         sub_command.add_argument("--page_size", help='The size of a data page in bytes', type=int, default=2097152)
         sub_command.add_argument("--cap-warn", help='Capacity warning level in percent, default=80',
                                  type=int, required=False, dest="cap_warn")
@@ -1294,7 +1294,7 @@ class CLIWrapper:
 
     def cluster_add(self, args):
         page_size_in_blocks = args.page_size
-        blk_size = args.blk_size
+        blk_size = 4096
         cap_warn = args.cap_warn
         cap_crit = args.cap_crit
         prov_cap_warn = args.prov_cap_warn
@@ -1321,7 +1321,7 @@ class CLIWrapper:
 
     def cluster_create(self, args):
         page_size_in_blocks = args.page_size
-        blk_size = args.blk_size
+        blk_size = 4096
         CLI_PASS = args.CLI_PASS
         cap_warn = args.cap_warn
         cap_crit = args.cap_crit

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/simplyblock_core/constants.py

@@ -76,7 +76,7 @@ TASK_EXEC_RETRY_COUNT = 8
 SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:v24.05-tag-latest"
 
 
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:SFAM-1702_ultra-96049924"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:main-latest"
 
 GELF_PORT = 12202
 

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-hmdi
-SIMPLY_BLOCK_VERSION=0.0.32
+SIMPLY_BLOCK_VERSION=0.0.34
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:hmdi
 DOCKER_USER=hamdysimplyblock

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/simplyblock_core/rpc_client.py

@@ -596,12 +596,12 @@ class RPCClient:
         params = {
             # "action_on_timeout": "abort",
             "bdev_retry_count": 0,
-            "transport_retry_count": 0,
+            "transport_retry_count": 3,
             "ctrlr_loss_timeout_sec": 1,
             "fast_io_fail_timeout_sec": 0,
             "reconnect_delay_sec": 1,
             "keep_alive_timeout_ms": 10000,
-            "transport_ack_timeout": 9,
+            "transport_ack_timeout": 10,
             "timeout_us": constants.NVME_TIMEOUT_US
         }
         return self._request("bdev_nvme_set_options", params)

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/simplyblock_core/storage_node_ops.py

@@ -1917,6 +1917,7 @@ def restart_storage_node(
     for db_dev in snode.nvme_devices:
         if db_dev.status in [NVMeDevice.STATUS_UNAVAILABLE, NVMeDevice.STATUS_READONLY, NVMeDevice.STATUS_ONLINE]:
             db_dev.status = NVMeDevice.STATUS_ONLINE
+            db_dev.health_check = True
             device_events.device_restarted(db_dev)
     snode.write_to_db(db_controller.kv_store)
 
@@ -2928,6 +2929,7 @@ def recreate_lvstore(snode):
 
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore, bs_nonleadership=True)
             sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
+            time.sleep(0.5)
 
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
@@ -2936,31 +2938,6 @@ def recreate_lvstore(snode):
     ret = rpc_client.bdev_examine(snode.raid)
     ret = rpc_client.bdev_wait_for_examine()
     ret = rpc_client.bdev_lvol_set_lvs_ops(snode.lvstore, snode.jm_vuid, snode.lvol_subsys_port)
-    # time.sleep(1)
-
-    # # connecting to remote devices
-    # logger.info("Connecting to remote devices")
-    # snode = db_controller.get_storage_node_by_id(snode.get_id())
-    # snode.remote_devices = _connect_to_remote_devs(snode)
-    # if snode.enable_ha_jm:
-    #     # online_devs = []
-    #     # for remote_device in snode.remote_jm_devices:
-    #     #     if remote_device.status == StorageNode.STATUS_ONLINE:
-    #     #         online_devs.append(remote_device)
-    #     #
-    #     # if len(online_devs) < 2:
-    #     #     devs = get_sorted_ha_jms(snode)
-    #     #     for did in devs:
-    #     #         dev = db_controller.get_jm_device_by_id(did)
-    #     #         online_devs.append(dev)
-    #     #         if len(online_devs) > snode.ha_jm_count - 1:
-    #     #             break
-    #     #
-    #     # snode.remote_jm_devices = online_devs
-    #     snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
-    # snode.write_to_db()
-    #
-    # time.sleep(2)
 
     if not lvol_list:
         prim_node_suspend = False
@@ -3002,6 +2979,8 @@ def recreate_lvstore(snode):
     #     ret = rpc_client.jc_explicit_synchronization(snode.jm_vuid)
     #     logger.info(f"JM Sync res: {ret}")
 
+    rpc_client.bdev_lvol_set_leader(True, lvs_name=snode.lvstore)
+
     if prim_node_suspend:
         if sec_node.status == StorageNode.STATUS_ONLINE:
             sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "allow")
@@ -3012,7 +2991,7 @@ def recreate_lvstore(snode):
         return False
 
     if sec_node.status == StorageNode.STATUS_ONLINE:
-        time.sleep(5)
+        time.sleep(10)
         sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "allow")
 
         # sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)

{sbcli_hmdi-0.0.32 → sbcli_hmdi-0.0.34}/simplyblock_web/node_utils.py

@@ -179,20 +179,15 @@ def firewall_port(port_id=9090, port_type="tcp", block=True):
 
             f"iptables -D INPUT -p {port_type} --dport {port_id} -j ACCEPT",
             f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",
-
             f"iptables -A INPUT -p {port_type} --dport {port_id} -j DROP",
-            # f"iptables -A INPUT -p {port_type} --dport {port_id} -j REJECT",
             f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j DROP",
-            # f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j REJECT",
             "iptables -L -n",
         ]
     else:
         cmd_list=[
 
             f"iptables -D INPUT -p {port_type} --dport {port_id} -j DROP",
-            # f"iptables -D INPUT -p {port_type} --dport {port_id} -j REJECT",
             f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j DROP",
-            # f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j REJECT",
 
             f"iptables -A INPUT -p {port_type} --dport {port_id} -j ACCEPT",
             f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",