исправление

This commit is contained in:
2026-10-15 19:44:46 +03:00
parent 825f6fdbf5
commit f7f689c7c2
26 changed files with 482 additions and 399 deletions
+14 -2
View File
@@ -3,6 +3,8 @@
make check-stack (= python student-tests/check_stack.py)
- не меньше 2 работающих реплик api, у них нет опубликованных портов (обойти балансировщик нельзя);
- в балансировщике каждая реплика под проверкой готовности, резервных серверов без проверки нет
(неготовая реплика не получает запросы ни при каких условиях);
- ни у одного сервиса нет container_name (иначе нельзя запустить несколько реплик одного сервиса);
- наружу опубликован только балансировщик и только на 127.0.0.1;
- у каждого работающего контейнера есть лимиты CPU и RAM;
@@ -13,7 +15,7 @@
import json
from helpers import check, run
from stand import api_containers, compose_config, compose_output, docker, inspect
from stand import api_containers, compose_config, compose_output, docker, inspect, lb_rows
def main():
@@ -55,6 +57,16 @@ def main():
check(published.get("lb") and all(b.startswith("127.0.0.1:") for b in published["lb"]),
"the balancer must be published on 127.0.0.1 only")
print("published: only lb, only on 127.0.0.1 (api replicas have no ports)")
servers = lb_rows("api")
backups = [row["svname"] for row in servers if row.get("bck") == "1"]
unchecked = [row["svname"] for row in servers
if not row.get("status", "").startswith("MAINT") and not row.get("check_status")]
check(not backups, f"backup servers in the balancer: {backups}")
check(not unchecked, f"servers without a readiness check in the balancer: {unchecked}")
in_use = [f"{row['svname']} {row['status']} ({row['check_status']})" for row in servers
if not row.get("status", "").startswith("MAINT")]
print(f"balancer: every api server is under the /health/ready check, no backup servers -> {', '.join(in_use)}")
print("limits: every running container has CPU and RAM limits")
def nets_of(name):
@@ -76,7 +88,7 @@ def main():
print("secrets: " + "; ".join(f"{name} -> {', '.join(wanted) or 'none'}" for name, wanted in expected.items()))
print("images: " + "; ".join(f"{name} {services[name]['image']}" for name in ("lb", "api", "postgres", "valkey")))
print("PASS: one entry point (lb on 127.0.0.1), >= 2 api replicas without ports and container_name, "
"CPU/RAM limits everywhere, stores only on the internal network")
"only ready replicas get traffic, CPU/RAM limits everywhere, stores only on the internal network")
if __name__ == "__main__":