sbcli-pre 1.4.0__zip → 1.4.2__zip

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

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

{sbcli_pre-1.4.0 → sbcli_pre-1.4.2}/env_var

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

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

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

{sbcli_pre-1.4.0 → sbcli_pre-1.4.2}/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.0 → sbcli_pre-1.4.2}/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,7 +134,7 @@ 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']:
@@ -185,6 +185,8 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     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:
@@ -416,11 +418,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.0 → sbcli_pre-1.4.2}/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.0 → sbcli_pre-1.4.2}/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.0 → sbcli_pre-1.4.2}/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)

{sbcli_pre-1.4.0 → sbcli_pre-1.4.2}/simplyblock_web/blueprints/web_api_deployer.py

@@ -141,6 +141,10 @@ def update_cluster(d, kv_store, storage_nodes, availability_zone):
     ECR_IMAGE_TAG = d.ecr_image_tag
     ECR_ACCOUNT_ID = d.ecr_account_id
     tf_logs_bucket_name = d.tf_logs_bucket_name
+    sbcli_cmd = d.sbcli_cmd
+    mgmt_nodes_instance_type = d.mgmt_nodes_instance_type
+    storage_nodes_instance_type = d.storage_nodes_instance_type
+    volumes_per_storage_nodes = d.volumes_per_storage_nodes
 
     d.status = "in_progress"
     d.write_to_db(kv_store)
@@ -159,10 +163,6 @@ def update_cluster(d, kv_store, storage_nodes, availability_zone):
         docker volume create terraform
         """,
         f"""
-        docker run --rm -v terraform:/app -e TF_LOG=DEBUG -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
-            workspace select -or-create {TF_WORKSPACE}
-        """,
-        f"""
         docker run --rm -v terraform:/app -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
             init -reconfigure -input=false \
                     -backend-config='bucket={TFSTATE_BUCKET}' \
@@ -170,12 +170,21 @@ def update_cluster(d, kv_store, storage_nodes, availability_zone):
                     -backend-config='region={TFSTATE_REGION}'
         """,
         f"""
+        docker run --rm -v terraform:/app -e TF_LOG=DEBUG -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
+            workspace select -or-create {TF_WORKSPACE}
+        """,
+        f"""
         docker run --rm -v terraform:/app -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
-            plan -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region}
+          plan -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region} \
+               -var mgmt_nodes_instance_type={mgmt_nodes_instance_type} -var storage_nodes_instance_type={storage_nodes_instance_type} \
+               -var volumes_per_storage_nodes={volumes_per_storage_nodes} -var sbcli_cmd={sbcli_cmd}
         """,
         f"""
         docker run --rm -v terraform:/app -w /app {ECR_ACCOUNT_ID}.dkr.ecr.{ECR_REGION}.amazonaws.com/{ECR_REPOSITORY_NAME}:{ECR_IMAGE_TAG} \
-         apply -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region} --auto-approve
+         apply -var mgmt_nodes={mgmt_nodes} -var storage_nodes={storage_nodes} -var az={availability_zone} -var region={aws_region} \
+               -var mgmt_nodes_instance_type={mgmt_nodes_instance_type} -var storage_nodes_instance_type={storage_nodes_instance_type} \
+               -var volumes_per_storage_nodes={volumes_per_storage_nodes} -var sbcli_cmd={sbcli_cmd} \
+            --auto-approve
         """
     ]
 
@@ -299,6 +308,8 @@ def validate_tf_vars(dpl_data):
         return "missing required param: mgmt_nodes_instance_type"
     if 'storage_nodes_instance_type' not in dpl_data:
         return "missing required param: storage_nodes_instance_type"
+    if 'volumes_per_storage_nodes' not in dpl_data:
+        return "missing required param: volumes_per_storage_nodes"
 
     return ""
 
@@ -375,6 +386,9 @@ def add_deployer():
     d.write_to_db(db_controller.kv_store)
 
     storage_nodes = int(dpl_data['storage_nodes'])
+    if d.storage_nodes+storage_nodes < 0:
+        return utils.get_response_error("total storage_nodes cannot be less than 0", 400)
+
     availability_zone = dpl_data['availability_zone']
     d.write_to_db(db_controller.kv_store)