sbcli-dev 6.1.7__tar.gz → 6.1.9__tar.gz

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/PKG-INFO

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

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/env_var

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

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_cli/cli.py

@@ -298,7 +298,7 @@ class CLIWrapper:
                                  dest='ha_type', choices=["single", "ha"], default='single')
         sub_command.add_argument("--enable-node-affinity", help='Enable node affinity for storage nodes', action='store_true')
         sub_command.add_argument("--qpair-count", help='tcp transport qpair count', type=int, dest='qpair_count',
-                                 default=20, choices=range(128))
+                                 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')
@@ -328,7 +328,7 @@ class CLIWrapper:
                                  dest='ha_type', choices=["single", "ha"], default='single')
         sub_command.add_argument("--enable-node-affinity", help='Enable node affinity for storage nodes', action='store_true')
         sub_command.add_argument("--qpair-count", help='tcp transport qpair count', type=int, dest='qpair_count',
-                                 default=6, choices=range(128))
+                                 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')

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_core/cluster_ops.py

@@ -173,7 +173,7 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     else:
         c.grafana_endpoint = f"http://{DEV_IP}/grafana"
     c.enable_node_affinity = enable_node_affinity
-    c.qpair_count = qpair_count or 6
+    c.qpair_count = qpair_count or constants.QPAIR_COUNT
 
     c.max_queue_size = max_queue_size
     c.inflight_io_threshold = inflight_io_threshold
@@ -324,7 +324,7 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     _create_update_user(cluster.uuid, cluster.grafana_endpoint, cluster.grafana_secret, cluster.secret)
 
     if distr_ndcs == 0 and distr_npcs == 0:
-        cluster.distr_ndcs = 4
+        cluster.distr_ndcs = 2
         cluster.distr_npcs = 1
     else:
         cluster.distr_ndcs = distr_ndcs
@@ -333,7 +333,7 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     cluster.distr_chunk_bs = distr_chunk_bs
     cluster.ha_type = ha_type
     cluster.enable_node_affinity = enable_node_affinity
-    cluster.qpair_count = qpair_count or 6
+    cluster.qpair_count = qpair_count or constants.QPAIR_COUNT
     cluster.max_queue_size = max_queue_size
     cluster.inflight_io_threshold = inflight_io_threshold
     cluster.enable_qos = enable_qos
@@ -710,7 +710,7 @@ def get_cluster(cl_id):
         logger.error(f"Cluster not found {cl_id}")
         return False
 
-    return json.dumps(cluster.get_clean_dict(), indent=2)
+    return json.dumps(cluster.get_clean_dict(), indent=2, sort_keys=True)
 
 
 def update_cluster(cl_id):

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_core/constants.py

@@ -105,4 +105,7 @@ INSTANCE_STORAGE_DATA = {
 MAX_SNAP_COUNT = 15
 
 SPDK_PROXY_MULTI_THREADING_ENABLED=True
-SPDK_PROXY_TIMEOUT=60*5
+SPDK_PROXY_TIMEOUT=60*5
+LVOL_NVME_CONNECT_RECONNECT_DELAY=3
+LVOL_NVME_CONNECT_CTRL_LOSS_TMO=-1
+QPAIR_COUNT=6

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_core/controllers/device_controller.py

@@ -163,15 +163,6 @@ def _def_create_device_stack(device_obj, snode, force=False):
     for iface in snode.data_nics:
         if iface.ip4_address:
             tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type)
-            # logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
             ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
             IP = iface.ip4_address
             break
@@ -910,14 +901,6 @@ def restart_jm_device(device_id, force=False, format_alceml=False):
                 for iface in snode.data_nics:
                     if iface.ip4_address:
                         tr_type = iface.get_transport_type()
-                        ret = rpc_client.transport_list()
-                        found = False
-                        if ret:
-                            for ty in ret:
-                                if ty['trtype'] == tr_type:
-                                    found = True
-                        if found is False:
-                            ret = rpc_client.transport_create(tr_type)
                         logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
                         ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
                         IP = iface.ip4_address

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_core/controllers/lvol_controller.py

@@ -621,14 +621,6 @@ def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0):
     for iface in snode.data_nics:
         if iface.ip4_address:
             tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type, cluster.qpair_count)
             logger.info("adding listener for %s on IP %s" % (lvol.nqn, iface.ip4_address))
             ret = rpc_client.listeners_create(lvol.nqn, tr_type, iface.ip4_address, "4420")
             is_optimized = False
@@ -707,14 +699,6 @@ def recreate_lvol_on_node(lvol, snode, ha_inode_self=0, ana_state=None):
     for iface in snode.data_nics:
         if iface.ip4_address:
             tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type, cluster.qpair_count)
             if not ana_state:
                 ana_state = "non_optimized"
                 if lvol.node_id == snode.get_id():
@@ -1113,7 +1097,9 @@ def connect_lvol(uuid):
                 "ip": ip,
                 "port": port,
                 "nqn": lvol.nqn,
-                "connect": f"sudo nvme connect --reconnect-delay=1 --ctrl-loss-tmo=600 --transport={transport} --traddr={ip} --trsvcid={port} --nqn={lvol.nqn}",
+                "connect": f"sudo nvme connect --reconnect-delay={constants.LVOL_NVME_CONNECT_RECONNECT_DELAY} "
+                           f"--ctrl-loss-tmo={constants.LVOL_NVME_CONNECT_CTRL_LOSS_TMO} --transport={transport} "
+                           f"--traddr={ip} --trsvcid={port} --nqn={lvol.nqn}",
             })
     return out
 

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_core/controllers/snapshot_controller.py

@@ -315,7 +315,6 @@ def clone(snapshot_id, clone_name, new_size=0):
     for iface in snode.data_nics:
         if iface.ip4_address:
             tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_create(tr_type, cluster.qpair_count)
             logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
             ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
 

{sbcli_dev-6.1.7 → sbcli_dev-6.1.9}/simplyblock_core/storage_node_ops.py

@@ -310,14 +310,6 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
         for iface in snode.data_nics:
             if iface.ip4_address:
                 tr_type = iface.get_transport_type()
-                ret = rpc_client.transport_list()
-                found = False
-                if ret:
-                    for ty in ret:
-                        if ty['trtype'] == tr_type:
-                            found = True
-                if found is False:
-                    ret = rpc_client.transport_create(tr_type)
                 logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
                 ana_state = "optimized"
                 if after_restart:
@@ -408,14 +400,6 @@ def _create_jm_stack_on_device(rpc_client, nvme, snode, after_restart):
         for iface in snode.data_nics:
             if iface.ip4_address:
                 tr_type = iface.get_transport_type()
-                ret = rpc_client.transport_list()
-                found = False
-                if ret:
-                    for ty in ret:
-                        if ty['trtype'] == tr_type:
-                            found = True
-                if found is False:
-                    ret = rpc_client.transport_create(tr_type)
                 logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
                 ana_state = "optimized"
                 if after_restart:
@@ -509,14 +493,6 @@ def _create_storage_device_stack(rpc_client, nvme, snode, after_restart):
     for iface in snode.data_nics:
         if iface.ip4_address:
             tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type, cluster.qpair_count)
             logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
             ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
             IP = iface.ip4_address
@@ -789,14 +765,6 @@ def _prepare_cluster_devices_on_restart(snode):
             for iface in snode.data_nics:
                 if iface.ip4_address:
                     tr_type = iface.get_transport_type()
-                    ret = rpc_client.transport_list()
-                    found = False
-                    if ret:
-                        for ty in ret:
-                            if ty['trtype'] == tr_type:
-                                found = True
-                    if found is False:
-                        ret = rpc_client.transport_create(tr_type, cluster.qpair_count)
                     logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
                     ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420",
                                                       ana_state="inaccessible")
@@ -1121,9 +1089,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         logger.error(f"Failed to Join docker swarm: {err}")
         return False
 
-    #rpc_user, rpc_pass = utils.generate_rpc_user_and_pass()
-    rpc_user = "rpc_username"
-    rpc_pass = "rpc_password"
+    rpc_user, rpc_pass = utils.generate_rpc_user_and_pass()
     mgmt_ip = node_info['network_interface'][iface_name]['ip']
     if not spdk_image:
         spdk_image = constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE
@@ -1289,6 +1255,16 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         logger.error("Failed to set nvme options")
         return False
 
+    if is_secondary_node:
+        qpair=max(len(db_controller.get_storage_nodes_by_cluster_id(cluster_id)), 5) * cluster.qpair_count
+    else:
+        qpair=cluster.qpair_count
+
+    ret = rpc_client.transport_create("TCP", qpair)
+    if not ret:
+        logger.error(f"Failed to create transport TCP with qpair: {qpair}")
+        # return False
+
     # 7- set jc singleton mask
     if snode.jc_singleton_mask:
         ret = rpc_client.jc_set_hint_lcpu_mask(snode.jc_singleton_mask)
@@ -1784,6 +1760,17 @@ def restart_storage_node(
         logger.error("Failed to set nvme options")
         return False
 
+
+    if snode.is_secondary_node:
+        qpair=max(len(db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)), 5) * cluster.qpair_count
+    else:
+        qpair=cluster.qpair_count
+
+    ret = rpc_client.transport_create("TCP", qpair)
+    if not ret:
+        logger.error(f"Failed to create transport TCP with qpair: {qpair}")
+        # return False
+
     # 7- set jc singleton mask
     if snode.jc_singleton_mask:
         ret = rpc_client.jc_set_hint_lcpu_mask(snode.jc_singleton_mask)