perf: multi-worker uvicorn + fix N+1 on the hottest path in the app
mbs-api ran single-worker uvicorn with no --workers flag at all — one
event loop handling every request. Now install.sh (and mbs update, so
existing installs pick it up too) compute a worker count from nproc
(clamped 1-4, matching typical VPS core counts) and bake it into the
systemd unit via sed substitution of a __WORKERS__ placeholder. Safe
to parallelize: verified no api.py module-level mutable state, all
of it already goes through sqlite (payment idempotency and the
xray-config file lock are already correct across separate processes,
not just asyncio tasks within one — confirmed both are OS/db-level,
not in-process). Verified with a mock dry-run of the new systemd-unit
section (fake nproc, real sed substitution) producing the expected
ExecStart line for several core counts.
Also: build_subscription_text() — called on every single hit of
/sub/{token}, the single most frequently called endpoint in the whole
app, since every VPN client re-fetches on every reconnect — was doing
one db.get_node() call per distinct node in a user's subscriptions
instead of fetching once. Same N+1 shape as the admin-endpoint bugs
fixed yesterday, except this one is on the hot path, not just the
admin panel. Fixed to batch-fetch via db.list_nodes() once.
Verified: correct output for a 4-node subscription (each node's
address appears exactly once, de1's 4 transports all present,
nothing silently dropped) and measured ~1.3ms/call average.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
parent
7098e59967
commit
11c75c13d1
4 changed files with 20 additions and 3 deletions
|
|
@ -377,8 +377,13 @@ cat > /usr/local/etc/xray/config.json << XRAYEOF
|
|||
XRAYEOF
|
||||
|
||||
echo "systemd-юниты..."
|
||||
CPU_COUNT=$(nproc 2>/dev/null || echo 1)
|
||||
if [ "$CPU_COUNT" -lt 2 ]; then API_WORKERS=1
|
||||
elif [ "$CPU_COUNT" -gt 4 ]; then API_WORKERS=4
|
||||
else API_WORKERS=$CPU_COUNT
|
||||
fi
|
||||
cp "$APP_DIR/systemd/mbs-bot.service" /etc/systemd/system/mbs-bot.service
|
||||
cp "$APP_DIR/systemd/mbs-api.service" /etc/systemd/system/mbs-api.service
|
||||
sed "s/__WORKERS__/$API_WORKERS/" "$APP_DIR/systemd/mbs-api.service" > /etc/systemd/system/mbs-api.service
|
||||
systemctl daemon-reload
|
||||
|
||||
echo "ставим CLI mbs..."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue