sbcli-pre 1.3.1__zip → 1.3.3__zip

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/PKG-INFO

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

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.3.1
+SIMPLY_BLOCK_VERSION=1.3.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/simplyblock_core/constants.py

@@ -53,14 +53,13 @@ GRAYLOG_CHECK_INTERVAL_SEC = 60
 FDB_CHECK_INTERVAL_SEC = 60
 
 SIMPLY_BLOCK_DOCKER_IMAGE = "simplyblock/simplyblock:pre-release"
-SIMPLY_BLOCK_DOCKER_IMAGE_ARM64 = "simplyblock/simplyblock:main-arm64"
 SIMPLY_BLOCK_CLI_NAME = "sbcli-dev"
 TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8
 
 SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:latest"
 SIMPLY_BLOCK_SPDK_CORE_IMAGE_ARM64 = "simplyblock/spdk-core:latest-arm64"
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:prerelease_v2-latest"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:prerelease-6e9243e4"
 
 GELF_PORT = 12201
 

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/simplyblock_core/controllers/caching_node_controller.py

@@ -568,8 +568,6 @@ def deploy(ifname):
 
     logger.info("Creating CachingNodeAPI container")
     cont_image = constants.SIMPLY_BLOCK_DOCKER_IMAGE
-    if utils.get_host_arch() == "aarch64":
-        cont_image = constants.SIMPLY_BLOCK_DOCKER_IMAGE_ARM64
     container = node_docker.containers.run(
         cont_image,
         "python simplyblock_web/caching_node_app.py",

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/simplyblock_core/rpc_client.py

@@ -118,8 +118,21 @@ class RPCClient:
         return self._request("nvmf_get_transports", params)
 
     def transport_create(self, trtype):
+        """
+            [{'trtype': 'TCP', 'max_queue_depth': 128,
+               'max_io_qpairs_per_ctrlr': 127, 'in_capsule_data_size': 4096,
+               'max_io_size': 131072, 'io_unit_size': 131072, 'max_aq_depth': 128,
+               'num_shared_buffers': 511, 'buf_cache_size': 4294967295,
+               'dif_insert_or_strip': False, 'zcopy': False, 'c2h_success': True,
+               'sock_priority': 0, 'abort_timeout_sec': 1}]
+            The output above is the default values of nvmf_get_transports
+            Failing of creating more than 127 lvols is because of max_io_qpairs_per_ctrlr
+            Currently, we set it to 256 and the max now is 246 lvols, because of bdev_io_pool_size
+            TODO, investigate what is the best configuration for the parameters above and bdev_io_pool_size
+        """
         params = {
-            "trtype": trtype
+            "trtype": trtype,
+            "max_io_qpairs_per_ctrlr": 256
         }
         return self._request("nvmf_create_transport", params)
 

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/simplyblock_core/services/storage_node_monitor.py

@@ -41,12 +41,12 @@ def get_cluster_target_status(cluster_id):
     offline_devices = 0
 
     for node in snodes:
-        if node.status == node.STATUS_ONLINE:
+        if node.status == StorageNode.STATUS_ONLINE:
             online_nodes += 1
             node_online_devices = 0
             node_offline_devices = 0
             for dev in node.nvme_devices:
-                if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_JM]:
+                if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_JM, NVMeDevice.STATUS_READONLY]:
                     node_online_devices += 1
                 else:
                     node_offline_devices += 1
@@ -85,6 +85,10 @@ def update_cluster_status(cluster_id):
     cluster = db_controller.get_cluster_by_id(cluster_id)
 
     if cluster.ha_type == "ha":
+
+        if cluster.status == Cluster.STATUS_READONLY:
+            return
+
         cluster_target_status = get_cluster_target_status(cluster_id)
         logger.info(f"Target cluster status {cluster_target_status}, current status: {cluster.status}")
         if cluster.status == cluster_target_status:
@@ -120,7 +124,7 @@ while True:
     clusters = db_controller.get_clusters()
     for cluster in clusters:
         cluster_id = cluster.get_id()
-        # get storage nodes
+
         nodes = db_controller.get_storage_nodes_by_cluster_id(cluster_id)
         for snode in nodes:
             if snode.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_UNREACHABLE]:

{sbcli_pre-1.3.1 → sbcli_pre-1.3.3}/simplyblock_web/blueprints/caching_node_ops_k8s.py

@@ -205,7 +205,7 @@ def get_info():
         "system_id": system_id,
 
         "cpu_count": cpu_info['count'],
-        "cpu_hz": cpu_info['hz_advertised'][0],
+        "cpu_hz": cpu_info['hz_advertised'][0] if 'hz_advertised' in cpu_info else 1,
 
         "memory": node_utils.get_memory(),
         "hugepages": node_utils.get_huge_memory(),