sbcli-pre 1.4.3__zip → 1.4.5__zip

{sbcli_pre-1.4.3 → sbcli_pre-1.4.5}/simplyblock_web/blueprints/caching_node_ops_k8s.py

@@ -14,7 +14,7 @@ from flask import request
 from kubernetes.client import ApiException
 from jinja2 import Environment, FileSystemLoader
 
-from simplyblock_core import constants
+from simplyblock_core import constants, shell_utils
 
 from simplyblock_web import utils, node_utils
 
@@ -111,6 +111,8 @@ def spdk_process_start():
     else:
         spdk_mem = 64096
 
+    spdk_mem_gega = int(spdk_mem / 1024)
+
     spdk_image = constants.SIMPLY_BLOCK_SPDK_CORE_IMAGE
     if node_utils.get_host_arch() == "aarch64":
         spdk_image = constants.SIMPLY_BLOCK_SPDK_CORE_IMAGE_ARM64
@@ -132,6 +134,7 @@ def spdk_process_start():
             'SPDK_IMAGE': spdk_image,
             'SPDK_CPU_MASK': spdk_cpu_mask,
             'SPDK_MEM': spdk_mem,
+            'MEM_GEGA': spdk_mem_gega,
             'SERVER_IP': data['server_ip'],
             'RPC_PORT': data['rpc_port'],
             'RPC_USERNAME': data['rpc_username'],
@@ -277,3 +280,75 @@ def disconnect_all():
     logger.debug(out)
     logger.debug(err)
     return utils.get_response(ret_code)
+
+
+
+
+@bp.route('/make_gpt_partitions', methods=['POST'])
+def make_gpt_partitions_for_nbd():
+    nbd_device = '/dev/nbd0'
+    jm_percent = 10
+
+    try:
+        data = request.get_json()
+        nbd_device = data['nbd_device']
+        jm_percent = data['jm_percent']
+    except:
+        pass
+
+    cmd_list = [
+        f"parted -fs {nbd_device} mklabel gpt",
+        f"parted -f {nbd_device} mkpart journal \"0%\" \"{jm_percent}%\""
+    ]
+    sg_cmd_list = [
+        f"sgdisk -t 1:6527994e-2c5a-4eec-9613-8f5944074e8b {nbd_device}",
+    ]
+
+    for cmd in cmd_list+sg_cmd_list:
+        logger.debug(cmd)
+        out, err, ret_code = shell_utils.run_command(cmd)
+        logger.debug(out)
+        logger.debug(ret_code)
+        if ret_code != 0:
+            logger.error(err)
+            return utils.get_response(False, f"Error running cmd: {cmd}, returncode: {ret_code}, output: {out}, err: {err}")
+        time.sleep(1)
+
+    return utils.get_response(True)
+
+
+
+@bp.route('/delete_dev_gpt_partitions', methods=['POST'])
+def delete_gpt_partitions_for_dev():
+
+    data = request.get_json()
+
+    if "device_pci" not in data:
+        return utils.get_response(False, "Required parameter is missing: device_pci")
+
+    device_pci = data['device_pci']
+
+    cmd_list = [
+        f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/uio_pci_generic/unbind",
+        f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/bind",
+    ]
+
+    for cmd in cmd_list:
+        logger.debug(cmd)
+        ret = os.popen(cmd).read().strip()
+        logger.debug(ret)
+        time.sleep(1)
+
+    device_name = os.popen(f"ls /sys/devices/pci0000:00/{device_pci}/nvme/nvme*/ | grep nvme").read().strip()
+    cmd_list = [
+        f"parted -fs /dev/{device_name} mklabel gpt",
+        f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/unbind",
+    ]
+
+    for cmd in cmd_list:
+        logger.debug(cmd)
+        ret = os.popen(cmd).read().strip()
+        logger.debug(ret)
+        time.sleep(1)
+
+    return utils.get_response(True)

{sbcli_pre-1.4.3 → sbcli_pre-1.4.5}/simplyblock_web/blueprints/snode_ops.py

@@ -8,6 +8,7 @@ import time
 
 import cpuinfo
 import docker
+import requests
 from docker.types import LogConfig
 from flask import Blueprint
 from flask import request
@@ -15,7 +16,6 @@ from flask import request
 from simplyblock_web import utils, node_utils
 
 from simplyblock_core import scripts, constants, shell_utils
-from ec2_metadata import ec2_metadata
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -23,26 +23,36 @@ bp = Blueprint("snode", __name__, url_prefix="/snode")
 
 cluster_id_file = "/etc/foundationdb/sbcli_cluster_id"
 
-CPU_INFO = cpuinfo.get_cpu_info()
-HOSTNAME, _, _ = node_utils.run_command("hostname -s")
-SYSTEM_ID = ""
-EC2_PUBLIC_IP = ""
-EC2_MD = ""
 
-try:
-    SYSTEM_ID = ec2_metadata.instance_id
-except:
-    SYSTEM_ID, _, _ = node_utils.run_command("dmidecode -s system-uuid")
+def get_google_cloud_info():
+    try:
+        headers = {'Metadata-Flavor': 'Google'}
+        response = requests.get("http://169.254.169.254/computeMetadata/v1/instance/?recursive=true", headers=headers)
+        data = response.json()
+        return {
+            "id": str(data["id"]),
+            "type": data["machineType"].split("/")[-1],
+            "cloud": "google",
+            "ip": data["networkInterfaces"][0]["ip"],
+            "public_ip": data["networkInterfaces"][0]["accessConfigs"][0]["externalIp"],
+        }
+    except:
+        pass
 
-try:
-    EC2_PUBLIC_IP = ec2_metadata.public_ipv4
-except:
-    pass
 
-try:
-    EC2_MD = ec2_metadata.instance_identity_document
-except:
-    pass
+def get_amazon_cloud_info():
+    try:
+        from ec2_metadata import ec2_metadata
+        data = ec2_metadata.instance_identity_document
+        return {
+            "id": data["instanceId"],
+            "type": data["instanceType"],
+            "cloud": "amazon",
+            "ip": data["privateIp"],
+            "public_ip": ec2_metadata.public_ipv4 or "",
+        }
+    except:
+        pass
 
 
 def get_docker_client():
@@ -203,27 +213,6 @@ def delete_cluster_id():
     return out
 
 
-def get_ec2_meta():
-    stream = os.popen('curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 1"')
-    token = stream.read()
-    stream = os.popen(f"curl -H \"X-aws-ec2-metadata-token: {token}\" http://169.254.169.254/latest/dynamic/instance-identity/document")
-    out = stream.read()
-    try:
-        data = json.loads(out)
-        return data
-    except:
-        return {}
-
-
-def get_ec2_public_ip():
-    stream = os.popen('curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 1"')
-    token = stream.read()
-    stream = os.popen(f"curl -H \"X-aws-ec2-metadata-token: {token}\" http://169.254.169.254/latest/meta-data/public-ipv4")
-    response = stream.read()
-    out = response if "404" not in response else None
-    return out
-
-
 @bp.route('/info', methods=['GET'])
 def get_info():
 
@@ -248,9 +237,7 @@ def get_info():
 
         "network_interface": node_utils.get_nics_data(),
 
-        "ec2_metadata": EC2_MD,
-
-        "ec2_public_ip": EC2_PUBLIC_IP,
+        "cloud_instance": CLOUD_INFO,
     }
     return utils.get_response(out)
 
@@ -381,3 +368,16 @@ def delete_gpt_partitions_for_dev():
         time.sleep(1)
 
     return utils.get_response(True)
+
+
+CPU_INFO = cpuinfo.get_cpu_info()
+HOSTNAME, _, _ = node_utils.run_command("hostname -s")
+SYSTEM_ID = ""
+CLOUD_INFO = get_amazon_cloud_info()
+if not CLOUD_INFO:
+    CLOUD_INFO = get_google_cloud_info()
+
+if CLOUD_INFO:
+    SYSTEM_ID = CLOUD_INFO["id"]
+else:
+    SYSTEM_ID, _, _ = node_utils.run_command("dmidecode -s system-uuid")

{sbcli_pre-1.4.3 → sbcli_pre-1.4.5}/simplyblock_web/templates/deploy_spdk.yaml.j2

@@ -37,6 +37,11 @@ spec:
         - name: script-config
           configMap:
             name: caching-node-restart-script-cm
+      tolerations:
+        - effect: NoSchedule
+          key: dedicated
+          operator: Equal
+          value: simplyblock-cache 
       initContainers:
         - name: copy-script
           image: busybox
@@ -81,10 +86,10 @@ spec:
           mountPath: /script
         resources:
           limits:
-            hugepages-2Mi: 2Gi
-            memory: 1024Mi
+            hugepages-2Mi: {{ MEM_GEGA }}Gi
+            memory: 4096Mi
           requests:
-            memory: 1024Mi
+            memory: 4096Mi
 
       - name: spdk-proxy-container
         image: {{ SPDK_IMAGE }}

sbcli_pre-1.4.3/sbcli_pre.egg-info/requires.txt

@@ -1,8 +0,0 @@
-foundationdb
-requests
-typing
-prettytable
-docker
-psutil
-py-cpuinfo
-graypy