sbcli-dev 6.3.1__tar.gz → 6.3.2__tar.gz

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/PKG-INFO

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

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/env_var

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

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/simplyblock_core/constants.py

@@ -108,5 +108,6 @@ SPDK_PROXY_MULTI_THREADING_ENABLED=True
 SPDK_PROXY_TIMEOUT=60*5
 LVOL_NVME_CONNECT_RECONNECT_DELAY=3
 LVOL_NVME_CONNECT_CTRL_LOSS_TMO=-1
-QPAIR_COUNT=20
+LVOL_NVME_CONNECT_NR_IO_QUEUES=6
+QPAIR_COUNT=32
 NVME_TIMEOUT_US=20000000

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/simplyblock_core/controllers/health_controller.py

@@ -276,7 +276,8 @@ def check_node(node_id, with_devices=True):
 
             if snode.secondary_node_id:
                 second_node_1 = db_controller.get_storage_node_by_id(snode.secondary_node_id)
-                lvstore_check &= _check_node_lvstore(lvstore_stack, second_node_1)
+                if second_node_1.status == StorageNode.STATUS_ONLINE:
+                    lvstore_check &= _check_node_lvstore(lvstore_stack, second_node_1)
 
         if snode.is_secondary_node:
             for node in db_controller.get_storage_nodes():

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/simplyblock_core/controllers/lvol_controller.py

@@ -1099,9 +1099,11 @@ def connect_lvol(uuid):
                 "nqn": lvol.nqn,
                 "reconnect-delay": constants.LVOL_NVME_CONNECT_RECONNECT_DELAY,
                 "ctrl-loss-tmo": constants.LVOL_NVME_CONNECT_CTRL_LOSS_TMO,
+                "nr-io-queues": constants.LVOL_NVME_CONNECT_NR_IO_QUEUES,
                 "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}",
+                           f"--ctrl-loss-tmo={constants.LVOL_NVME_CONNECT_CTRL_LOSS_TMO} "
+                           f"--nr-io-queues={constants.LVOL_NVME_CONNECT_NR_IO_QUEUES} "
+                           f"--transport={transport} --traddr={ip} --trsvcid={port} --nqn={lvol.nqn}",
             })
     return out
 

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/simplyblock_core/services/new_device_discovery.py

@@ -1,25 +1,13 @@
 # coding=utf-8
-import logging
 import time
-import sys
 
-from simplyblock_core import constants, kv_store, storage_node_ops
+from simplyblock_core import constants, kv_store, storage_node_ops, utils
 from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.models.storage_node import StorageNode
 
-# Import the GELF logger
-from graypy import GELFTCPHandler
-
 from simplyblock_core.snode_client import SNodeClient
 
-# configure logging
-logger_handler = logging.StreamHandler(stream=sys.stdout)
-logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
-gelf_handler = GELFTCPHandler('0.0.0.0', constants.GELF_PORT)
-logger = logging.getLogger()
-logger.addHandler(gelf_handler)
-logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
+logger = utils.get_logger(__name__)
 
 # get DB controller
 db_store = kv_store.KVStore()

{sbcli_dev-6.3.1 → sbcli_dev-6.3.2}/simplyblock_core/storage_node_ops.py

@@ -1255,14 +1255,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         logger.error("Failed to set nvme options")
         return False
 
-    qpair = min(max(len(db_controller.get_storage_nodes_by_cluster_id(cluster_id)), 5) * snode.number_of_distribs, constants.QPAIR_COUNT)
-    if is_secondary_node:
-        qpair *= 2
-
+    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
+        return False
 
     # 7- set jc singleton mask
     if snode.jc_singleton_mask:
@@ -1756,15 +1753,11 @@ def restart_storage_node(
         logger.error("Failed to set nvme options")
         return False
 
-    qpair = max(max(len(db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)), 5) * snode.number_of_distribs,
-                constants.QPAIR_COUNT)
-    if snode.is_secondary_node:
-        qpair *= 2
-
+    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
+        return False
 
     # 7- set jc singleton mask
     if snode.jc_singleton_mask: