rp pool balancer

6890d130 · Karsa Zoltán István · 3c569d1c · 6890d130 · 6890d130 · 6890d130
Commit 6890d130 authored Oct 25, 2023 by Karsa Zoltán István
Show whitespace changes
Inline Side-by-side

Showing with 109 additions and 35 deletions

balancer/stats.py
+16 -8

balancer/util.py
+51 -8

main.py
+6 -9

sredis/sredis.py
+36 -10

No files found.
--- a/balancer/stats.py
+++ b/balancer/stats.py
@@ -18,6 +18,7 @@ STAT_TARGETS = {
    "cpu_percent": CPU_PERCENT_TARGET,
 }
 def get_static_info_from_dc(datacenter):
    url: str = f"{datacenter}/{STATIC_INFO}"
    req = requests.request(
@@ -37,10 +38,11 @@ def get_static_info_from_dc(datacenter):
            max_ram = data["max_ram"]
            return core_num, max_ram
        except json.decoder.JSONDecodeError:
-            logger.warning(f"JSON decoding error: Static infos")
+            logger.warning("JSON decoding error: Static infos")
            return 0, 0
-def get_stat_from_dc(datacenter, retry = False):
+def get_stat_from_dc(datacenter, retry=False):
    stat = {}
    for key, target in STAT_TARGETS.items():
        url: str = f"{datacenter}/{target}"
@@ -56,10 +58,13 @@ def get_stat_from_dc(datacenter, retry = False):
        else:
            try:
                data = json.loads(req.content)
-                stat[key] = [max(
+                stat[key] = [
+                    max(
                        i["datapoints"][0][0] if i["datapoints"][0][0] else 0.0,
-                        i["datapoints"][1][0] if i["datapoints"][1][0] else 0.0
+                        i["datapoints"][1][0] if i["datapoints"][1][0] else 0.0,
-                    ) for i in data]
+                    )
+                    for i in data
+                ]
                if retry and stat[key][0] is None:
                    time.sleep(1)
@@ -69,10 +74,13 @@ def get_stat_from_dc(datacenter, retry = False):
                        verify=False,
                    )
                    data = json.loads(req.content)
-                    stat[key] = [max(
+                    stat[key] = [
+                        max(
                            i["datapoints"][0][0] if i["datapoints"][0][0] else 0.0,
-                        i["datapoints"][1][0] if i["datapoints"][1][0] else 0.0
+                            i["datapoints"][1][0] if i["datapoints"][1][0] else 0.0,
-                    ) for i in data]
+                        )
+                        for i in data
+                    ]
            except json.decoder.JSONDecodeError:
                logger.warning(f"JSON decoding error: key {key}")
                stat[key] = 0.0

--- a/balancer/util.py
+++ b/balancer/util.py
 from fastapi.responses import ORJSONResponse
-from balancer.stats import get_stat_from_dc
 from sredis.sredis import (
+    available_ram,
    get_all_datacenter,
    get_datacenter_token,
    pop_vm,
@@ -24,12 +24,18 @@ def proxy_datacenters(
    balancer_fun=rr_get,
    datacenter=None,
 ):
+    vm_ram = 4096
+    cpu_core = 1
+    if "ram_size" in body:
+        vm_ram = body["ram_size"]
+    if "num_cores" in body:
+        cpu_core = body["num_cores"]
    if "datacenter" in body:
        server = body["datacenter"]
    elif datacenter:
        server = datacenter
    else:
-        server = balancer_fun()
+        server = balancer_fun(vm_ram, cpu_core)
    token = get_datacenter_token(username, server)
    url = f"{server}/{serverpath}"
    try:
@@ -85,9 +91,9 @@ def create_vm_from_template(
 def create_rp(username: str, rp: ResourcePoolSchema):
-    if rp.manual:
    id = 0
    errors = 0
+    if rp.manual:
        for dc, cnt in rp.manual.items():
            for _ in range(cnt):
                try:
@@ -103,13 +109,50 @@ def create_rp(username: str, rp: ResourcePoolSchema):
                    id += 1
                except Exception:
                    errors += 1
+    else:
+        details = check_template_details_from_name(rp.from_template, username)
+        ram_sum = details["ram_size"] * rp.num_vms
+        avail_ram = available_ram()
+        avail_ram_sum = sum(avail_ram.values())
+        frac = ram_sum / avail_ram_sum
+        for dc, ram in avail_ram.items():
+            cnt = int(frac * ram / details["ram_size"])
+            for _ in range(cnt):
+                try:
+                    create_vm_from_template(
+                        dc,
+                        username,
+                        name=f"{rp.rpname} #{id}",
+                        template_name=rp.from_template,
+                    )
+                    save_rpvm(rp.rpname, username, dc, id, rp.key)
+                    id += 1
+                except Exception:
+                    errors += 1
    return id, errors
-    else:
-        datacenters = get_all_datacenter()
+def check_template_details_from_name(template_name, username):
-        stats = {}
+    dcs = get_all_datacenter()
-        for dc in datacenters:
-            stats[dc] = get_stat_from_dc(dc)
+    details = {"ram_size": 0, "num_cores": 1}
+    for dc in dcs:
+        resp = proxy_datacenters(
+            f"dashboard/acpi/template?name={template_name}", username, datacenter=dc
+        )
+        if resp.status_code != 200:
+            raise HTTPException(
+                tatus_code=500,
+                detail=f"Remote server error: {dc} - code {resp.status_code}",
+            )
+        details["num_cores"] = max(details["num_cores"], resp["num_cores"])
+        details["ram_size"] = max(details["ram_size"], resp["ram_size"])
+    return details
 def update_vm_owner(datacenter, vm_id, username):

--- a/main.py
+++ b/main.py
@@ -132,9 +132,7 @@ def update_datacenter_stat(
 @app.get("/stats/")
-def get_datacenter_stat(
+def get_datacenter_stat(username=Depends(get_current_user)):
-    username=Depends(get_current_user)
-): 
    stats = get_all_stats()
    stats = [
        ResourceStat(
@@ -143,20 +141,19 @@ def get_datacenter_stat(
            mem_used=x.mem_used,
            cpu_usage=x.cpu_usage,
            vm_count=x.vm_count,
-            cpu_core=x.cpu_core
+            cpu_core=x.cpu_core,
-        ) for x in stats
+        )
+        for x in stats
    ]
    return stats
 @app.get("/stats/ram/")
-def get_datacenter_stat(
+def get_datacenter_stat_ram(username=Depends(get_current_user), vm_ram: int = 1024):
-    username=Depends(get_current_user), vm_ram: int = 1024
-): 
    stats = valid_ram_datacenters(vm_ram)
    return stats
 @app.get("/tokens/")
 def get_tokens(username=Depends(get_current_user)):
    return get_rtokens(username=username)

--- a/sredis/sredis.py
+++ b/sredis/sredis.py
@@ -68,10 +68,16 @@ def update_datacenter_stats():
            datacenter_name=dc,
            cpu_core=cpu_core,
            mem_max=int(mem_max / 1048576) if mem_max else 4096,
-            mem_allocated=int(stats["mem_allocated"][0] / 1048576.0) if stats["mem_allocated"] else 0,
+            mem_allocated=int(stats["mem_allocated"][0] / 1048576.0)
-            mem_used=int(stats["mem_usage"][0] * 4096 / 100.0) if stats["mem_usage"][0] else 0,
+            if stats["mem_allocated"]
-            cpu_usage=float(stats["cpu_percent"][0]) if stats["cpu_percent"][0] else 0.0,
+            else 0,
-            vm_count=int(stats["vmcount"][0])  if stats["vmcount"][0] else 0 
+            mem_used=int(stats["mem_usage"][0] * 4096 / 100.0)
+            if stats["mem_usage"][0]
+            else 0,
+            cpu_usage=float(stats["cpu_percent"][0])
+            if stats["cpu_percent"][0]
+            else 0.0,
+            vm_count=int(stats["vmcount"][0]) if stats["vmcount"][0] else 0,
        )
        update_stats(rs)
@@ -85,8 +91,12 @@ def add_datacenter(datacenter: str):
    update_status(datacenter)
-def rr_get():
+def rr_get(vm_ram, cpu_core):
    rr = r.rpoplpush("rrlist", "rrlist")
+    valid = valid_ram_datacenter(rr, vm_ram)
+    while not valid:
+        rr = r.rpoplpush("rrlist", "rrlist")
+        valid = valid_ram_datacenter(rr, vm_ram)
    return rr
@@ -96,6 +106,14 @@ def wr_get(centers: DataCenterSchema):
    return random.choice(indexis, weights=())[0]
+def available_ram():
+    dcs = DataCenterResource.find().all()
+    valid_dcs = {}
+    for dc in dcs:
+        valid_dcs[dc.datacenter_name] = dc.mem_max - dc.mem_used
+    return valid_dcs
 def set_token(username: str, datacenter: str, token: str):
    r.hset(f"tokens:{username}", datacenter, token)
@@ -161,7 +179,7 @@ def update_stats(stat: ResourceStat):
            mem_used=stat.mem_used,
            cpu_usage=stat.cpu_usage,
            vm_count=stat.vm_count,
-            cpu_core=stat.cpu_core
+            cpu_core=stat.cpu_core,
        )
        dc.save()
    else:
@@ -173,18 +191,25 @@ def update_stats(stat: ResourceStat):
        dc.cpu_core = stat.cpu_core if stat.cpu_core else dc.cpu_core
        dc.save()
-def get_stats(datacenter_name :str):
-    dc = DataCenterResource.find(DataCenterResource.datacenter_name == datacenter_name).get_item()
+def get_stats(datacenter_name: str):
+    dc = DataCenterResource.find(
+        DataCenterResource.datacenter_name == datacenter_name
+    ).get_item()
    return dc
-def valid_ram_datacenter(datacenter_name :str, vm_mem: int):
-    dc = DataCenterResource.find(DataCenterResource.datacenter_name == datacenter_name).get_item()
+def valid_ram_datacenter(datacenter_name: str, vm_mem: int):
+    dc = DataCenterResource.find(
+        DataCenterResource.datacenter_name == datacenter_name
+    ).get_item()
    if dc is None:
        return False
    if dc.mem_max - dc.mem_used > vm_mem:
        return True
    return False
 def valid_ram_datacenters(vm_mem: int):
    dcs = DataCenterResource.find().all()
    valid_dcs = []
@@ -193,6 +218,7 @@ def valid_ram_datacenters(vm_mem: int):
            valid_dcs.append(dc.datacenter_name)
    return valid_dcs
 def get_all_stats():
    dcs = DataCenterResource.find().all()
    return dcs