sbcli-pre 1.4.2__zip → 1.4.4__zip

{sbcli_pre-1.4.2 → sbcli_pre-1.4.4}/PKG-INFO

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

{sbcli_pre-1.4.2 → sbcli_pre-1.4.4}/env_var

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

{sbcli_pre-1.4.2 → sbcli_pre-1.4.4}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.4.2 → sbcli_pre-1.4.4}/simplyblock_cli/cli.py

@@ -585,8 +585,8 @@ class CLIWrapper:
         sub_command.add_argument("--memory", help='SPDK huge memory allocation, default is Max hugepages available', dest='spdk_mem')
         sub_command.add_argument("--spdk-image", help='SPDK image uri', dest='spdk_image')
         sub_command.add_argument("--namespace", help='k8s namespace to deploy on',)
-        sub_command.add_argument("--multipathing", help='Enable multipathing for lvol connection, default: True',
-                                 type=bool, default=True)
+        sub_command.add_argument("--multipathing", help='Enable multipathing for lvol connection, default: on',
+                                 default="on", choices=["on", "off"])
 
         self.add_sub_command(subparser, 'list', 'List Caching nodes')
 
@@ -1069,7 +1069,7 @@ class CLIWrapper:
                 data_nics = []
                 spdk_image = args.spdk_image
                 namespace = args.namespace
-                multipathing = args.multipathing
+                multipathing = args.multipathing == "on"
 
                 spdk_cpu_mask = None
                 if args.spdk_cpu_mask:

{sbcli_pre-1.4.2 → sbcli_pre-1.4.4}/simplyblock_core/constants.py

@@ -43,8 +43,6 @@ weights = {
     "w_b": 10
 }
 
-# To use 75% of hugepages to calculate ssd size to use for the ocf bdev
-CACHING_NODE_MEMORY_FACTOR = 0.75
 
 HEALTH_CHECK_INTERVAL_SEC = 60
 

{sbcli_pre-1.4.2 → sbcli_pre-1.4.4}/simplyblock_core/controllers/caching_node_controller.py

@@ -140,18 +140,22 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     if "memory_details" in node_info and node_info['memory_details']:
         memory_details = node_info['memory_details']
         logger.info("Node Memory info")
-        logger.info(f"Total: {utils.humanbytes(memory_details['total'])}")
-        logger.info(f"Free: {utils.humanbytes(memory_details['free'])}")
-        # logger.info(f"Hugepages Total: {utils.humanbytes(memory_details['huge_total'])}")
-        # huge_free = memory_details['huge_free']
-        # logger.info(f"Hugepages Free: {utils.humanbytes(huge_free)}")
+        logger.info(f"RAM Total: {utils.humanbytes(memory_details['total'])}")
+        logger.info(f"RAM Free: {utils.humanbytes(memory_details['free'])}")
+        huge_total = memory_details['huge_total']
+        logger.info(f"HP Total: {utils.humanbytes(huge_total)}")
+        huge_free = memory_details['huge_free']
+        logger.info(f"HP Free: {utils.humanbytes(huge_free)}")
         # if huge_free < 1 * 1024 * 1024:
         #     logger.warning(f"Free hugepages are less than 1G: {utils.humanbytes(huge_free)}")
         if not spdk_mem:
-            spdk_mem = memory_details['free']
+            if huge_total > 1024 * 1024 * 1024:
+                spdk_mem = huge_total
+            else:
+                logger.error(f"Free hugepages are less than 1G: {utils.humanbytes(huge_total)}")
+                return False
 
-    logger.info(f"Trying to set hugepages for: {utils.humanbytes(spdk_mem)}")
-    logger.info("Deploying SPDK")
+    logger.info(f"Deploying SPDK with HP: {utils.humanbytes(spdk_mem)}")
     results, err = snode_api.spdk_process_start(
         spdk_cpu_mask, spdk_mem, spdk_image, snode.mgmt_ip,
         snode.rpc_port, snode.rpc_username, snode.rpc_password, namespace)
@@ -174,19 +178,19 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
         logger.error("Pod is not running, exiting")
         return False
 
+    time.sleep(10)
+
     # creating RPCClient instance
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
         snode.rpc_username, snode.rpc_password,
         timeout=60*5, retry=5)
 
-    # get new node info after starting spdk
-    node_info, _ = snode_api.info()
-    mem = node_info['memory_details']['huge_free']
-    logger.info(f"Free Hugepages detected: {utils.humanbytes(mem)}")
+    # # get new node info after starting spdk
+    # node_info, _ = snode_api.info()
+    # mem = node_info['memory_details']['huge_free']
+    # logger.info(f"Free Hugepages detected: {utils.humanbytes(mem)}")
 
-    time.sleep(60)
-    
     # adding devices
     nvme_devs = addNvmeDevices(cluster, rpc_client, node_info['spdk_pcie_list'], snode)
     if not nvme_devs:
@@ -197,16 +201,16 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     snode.write_to_db(db_controller.kv_store)
     ssd_dev = nvme_devs[0]
 
-    if mem < 1024*1024:
+    if spdk_mem < 1024*1024:
         logger.error("Hugepages must be larger than 1G")
         return False
 
-    mem = int(mem*constants.CACHING_NODE_MEMORY_FACTOR)
+    mem = spdk_mem - 1024*1024*1024
     snode.hugepages = mem
     logger.info(f"Hugepages to be used: {utils.humanbytes(mem)}")
 
     ssd_size = ssd_dev.size
-    supported_ssd_size = mem * 100 / 2
+    supported_ssd_size = mem * 100 / 2.25
     split_factor = math.ceil(ssd_size/supported_ssd_size)
 
     logger.info(f"Supported SSD size: {utils.humanbytes(supported_ssd_size)}")