sbcli-hmdi 0.0.16__tar.gz → 0.0.18__tar.gz

{sbcli_hmdi-0.0.16 → sbcli_hmdi-0.0.18}/PKG-INFO

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

{sbcli_hmdi-0.0.16 → sbcli_hmdi-0.0.18}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.16 → sbcli_hmdi-0.0.18}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.16 → sbcli_hmdi-0.0.18}/simplyblock_core/rpc_client.py

@@ -138,16 +138,16 @@ class RPCClient:
         params = {
             "trtype": trtype,
             "max_io_qpairs_per_ctrlr": qpair_count,
-            "max_queue_depth": 512,
-            "abort_timeout_sec": 2,
-            "ack_timeout": 512,
+            "max_queue_depth": 2048,
+            "abort_timeout_sec": 5,
+            "ack_timeout": 2048,
             "zcopy": True,
             "in_capsule_data_size": 4096,
             "max_io_size": 131072,
             "io_unit_size": 8192,
             "max_aq_depth": 128,
             "num_shared_buffers": 8192,
-            "buf_cache_size": 512,
+            "buf_cache_size": 32,
             "dif_insert_or_strip": False,
             "c2h_success": True,
             "sock_priority": 0
@@ -480,7 +480,8 @@ class RPCClient:
             "name": name,
             "raid_level": raid_level,
             "strip_size_kb": strip_size_kb,
-            "base_bdevs": bdevs_list
+            "base_bdevs": bdevs_list,
+            "io_unmap_limit": 100
         }
         if raid_level == "1":
             params["strip_size_kb"] = 0
@@ -594,14 +595,14 @@ class RPCClient:
     def bdev_nvme_set_options(self):
         params = {
             # "action_on_timeout": "abort",
-            "bdev_retry_count": 0,
-            "transport_retry_count": 0,
+            "bdev_retry_count": 3,
+            "transport_retry_count": 5,
             "ctrlr_loss_timeout_sec": 1,
             "fast_io_fail_timeout_sec": 0,
             "reconnect_delay_sec": 1,
-            "keep_alive_timeout_ms": 1000,
-            "transport_ack_timeout": 3,
-            "timeout_us": 200000
+            "keep_alive_timeout_ms": 10000,
+            "transport_ack_timeout": 10,
+            "timeout_us": constants.NVME_TIMEOUT_US
         }
         return self._request("bdev_nvme_set_options", params)
 

{sbcli_hmdi-0.0.16 → sbcli_hmdi-0.0.18}/simplyblock_core/storage_node_ops.py

@@ -3031,7 +3031,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     strip_size_kb = utils.nearest_upper_power_of_2(strip_size_kb)
     jm_vuid = 0
     jm_ids = []
-    lvol_subsys_port = 9090
+    lvol_subsys_port = utils.get_next_port(snode.cluster_id)
     if snode.enable_ha_jm:
         jm_vuid = utils.get_random_vuid()
         jm_ids = get_sorted_ha_jms(snode)

{sbcli_hmdi-0.0.16 → sbcli_hmdi-0.0.18}/simplyblock_core/utils.py

@@ -714,3 +714,22 @@ def handle_task_result(task: JobSchedule, res: dict, allowed_error_codes = None)
 
 
 logger = get_logger(__name__)
+
+
+def get_next_port(cluster_id):
+    from simplyblock_core.db_controller import DBController
+    db_controller = DBController()
+
+    port = 9090
+    used_ports = []
+    for node in db_controller.get_storage_nodes_by_cluster_id(cluster_id):
+        if node.lvol_subsys_port > 0 and node.lvol_subsys_port != 4420:
+            used_ports.append(node.lvol_subsys_port)
+
+    for i in range(100):
+        next_port = port + i
+
+        if next_port not in used_ports:
+            return next_port
+
+    return 0