sbcli-pre 1.4.4__zip → 1.4.6__zip

{sbcli_pre-1.4.4 → sbcli_pre-1.4.6}/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.4 → sbcli_pre-1.4.6}/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.4/sbcli_pre.egg-info/requires.txt

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