sbcli-pre 1.4.1__zip → 1.4.3__zip

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/PKG-INFO

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

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/env_var

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

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/simplyblock_cli/cli.py

@@ -585,6 +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)
 
         self.add_sub_command(subparser, 'list', 'List Caching nodes')
 
@@ -1067,6 +1069,7 @@ class CLIWrapper:
                 data_nics = []
                 spdk_image = args.spdk_image
                 namespace = args.namespace
+                multipathing = args.multipathing
 
                 spdk_cpu_mask = None
                 if args.spdk_cpu_mask:
@@ -1082,7 +1085,7 @@ class CLIWrapper:
                         return f"SPDK memory:{args.spdk_mem} must be larger than 1G"
 
                 ret = caching_node_controller.add_node(
-                    cluster_id, node_ip, ifname, data_nics, spdk_cpu_mask, spdk_mem, spdk_image, namespace)
+                    cluster_id, node_ip, ifname, data_nics, spdk_cpu_mask, spdk_mem, spdk_image, namespace, multipathing)
 
             if sub_command == "list":
                 #cluster_id

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/simplyblock_core/controllers/caching_node_controller.py

@@ -74,7 +74,7 @@ def addNvmeDevices(cluster, rpc_client, devs, snode):
     return devices
 
 
-def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spdk_mem, spdk_image=None, namespace=None):
+def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spdk_mem, spdk_image=None, namespace=None, multipathing=True):
     db_controller = DBController()
     kv_store = db_controller.kv_store
 
@@ -134,24 +134,23 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     snode.cpu = node_info['cpu_count']
     snode.cpu_hz = node_info['cpu_hz']
     snode.memory = node_info['memory']
-    # snode.hugepages = node_info['hugepages']
+    snode.multipathing = multipathing
 
     # check for memory
     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'])}")
+        logger.info(f"RAM Total: {utils.humanbytes(memory_details['total'])}")
+        logger.info(f"RAM Free: {utils.humanbytes(memory_details['free'])}")
+        logger.info(f"HP 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"HP Free: {utils.humanbytes(memory_details['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']
+            spdk_mem = memory_details['huge_free']
 
-    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,16 +173,18 @@ 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)}")
 
     # adding devices
     nvme_devs = addNvmeDevices(cluster, rpc_client, node_info['spdk_pcie_list'], snode)
@@ -195,16 +196,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
     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)}")
@@ -416,11 +417,12 @@ def connect(caching_node_id, lvol_id):
         logger.error("Failed to connect to local subsystem")
         return False
 
-    snode = db_controller.get_storage_node_by_id(lvol.node_id)
-    for nic in snode.data_nics:
-        ip = nic.ip4_address
-        ret, _ = cnode_client.connect_nvme(ip, "4420", subsystem_nqn)
-        break
+    if cnode.multipathing:
+        snode = db_controller.get_storage_node_by_id(lvol.node_id)
+        for nic in snode.data_nics:
+            ip = nic.ip4_address
+            ret, _ = cnode_client.connect_nvme(ip, "4420", subsystem_nqn)
+            break
 
     time.sleep(5)
     cnode_info, _ = cnode_client.info()

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/simplyblock_core/controllers/lvol_controller.py

@@ -611,7 +611,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
     lvol.npcs = distr_npcs
     lvol.distr_bs = distr_bs
     lvol.distr_chunk_bs = distr_chunk_bs
-    lvol.distr_page_size = cl.page_size_in_blocks
+    lvol.distr_page_size = (distr_npcs+distr_npcs)*cl.page_size_in_blocks
 
     lvol.base_bdev = f"distr_{lvol.vuid}_{name}"
     lvol.top_bdev = lvol.base_bdev

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/simplyblock_core/models/caching_node.py

@@ -90,6 +90,7 @@ class CachingNode(BaseModel):
         "cpu_hz": {"type": int, "default": 0},
         "memory": {"type": int, "default": 0},
         "hugepages": {"type": int, "default": 0},
+        "multipathing": {"type": bool, "default": True},
 
     }
 

{sbcli_pre-1.4.1 → sbcli_pre-1.4.3}/simplyblock_web/blueprints/web_api_caching_node.py

@@ -36,6 +36,7 @@ def add_node_to_cluster():
     spdk_mem = None
     spdk_image = None
     namespace = None
+    multipathing = True
 
     if 'spdk_cpu_mask' in cl_data:
         spdk_cpu_mask = cl_data['spdk_cpu_mask']
@@ -52,9 +53,12 @@ def add_node_to_cluster():
     if 'namespace' in cl_data:
         namespace = cl_data['namespace']
 
+    if 'multipathing' in cl_data:
+        multipathing = bool(cl_data['multipathing'])
+
     t = threading.Thread(
         target=caching_node_controller.add_node,
-        args=(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spdk_mem, spdk_image, namespace))
+        args=(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spdk_mem, spdk_image, namespace, multipathing))
     t.start()
 
     return utils.get_response(True)