ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
fix(capacity): an attached volume rescues a disk-shortfall verdict
Juan Denis919b057ce0a0
diff --git a/backend/app/services/capacity_service.py b/backend/app/services/capacity_service.pyindex 4a63ee11..3b2f6504 100644--- a/backend/app/services/capacity_service.py+++ b/backend/app/services/capacity_service.py@@ -19,6 +19,7 @@ than guessing, because a confident wrong answer is worse than no answer."""import logging+import osimport refrom datetime import datetime, timedelta@@ -122,11 +123,12 @@ def check_fit(template, server_id=None):headroom.get('disk_total'),DISK_RESERVE_FRACTION, DISK_RESERVE_MIN),]+ _apply_other_mounts(checks, headroom)verdict = _worst(check['verdict'] for check in checks)return {'verdict': verdict,- 'headline': _headline(verdict, headroom),+ 'headline': _headline(verdict, headroom, checks),'detail': _detail(verdict, checks, footprint, headroom),'blocking': False, # never; the operator decides'requirements': footprint,@@ -162,6 +164,29 @@ def _check_resource(name, need, free, total, reserve_fraction, reserve_min):return check+def _apply_other_mounts(checks, headroom):+ """An attached volume can rescue a disk shortfall — say so, don't cry wolf.++ ``disk_free`` measures ONE filesystem (the data path). A box with a volume+ attached has more room than that number admits, and telling its operator+ "this server doesn't have room" is then simply wrong — the app's data can+ live on the volume. When the shortfall is on disk and another writable+ filesystem could hold the whole footprint, downgrade to "tight" and name+ the volume. Memory has no equivalent escape hatch.+ """+ disk = next((c for c in checks if c['resource'] == 'disk'), None)+ if disk is None or disk['verdict'] != 'insufficient':+ return+ candidates = [m for m in (headroom.get('other_mounts') or [])+ if (m.get('free') or 0) >= disk['need']]+ if not candidates:+ return+ best = max(candidates, key=lambda m: m['free'])+ disk['verdict'] = 'tight'+ disk['alt_mountpoint'] = best['mountpoint']+ disk['alt_free'] = best['free']++def _worst(verdicts):seen = set(verdicts)for level in SEVERITY:@@ -170,10 +195,12 @@ def _worst(verdicts):return 'unknown'-def _headline(verdict, headroom):+def _headline(verdict, headroom, checks=()):if verdict == 'insufficient':return "This server doesn't have room for it"if verdict == 'tight':+ if any(c.get('alt_mountpoint') for c in checks):+ return 'It fits, if its data lives on the attached volume'return 'It fits, but this server will be tight'if verdict == 'ok':return 'Fits comfortably'@@ -203,13 +230,21 @@ def _detail(verdict, checks, footprint, headroom):short = [c for c in checks if c['verdict'] == 'insufficient']if short:names = ' and '.join(c['resource'] for c in short)- sentence += f' That is more {names} than it has.'+ sentence += f' That is more {names} than it has free.'else:- tight = [c for c in checks if c['verdict'] == 'tight']+ # A check rescued by an attached volume explains itself; the generic+ # "would leave only" arithmetic is meaningless for it (negative).+ rescued = [c for c in checks if c.get('alt_mountpoint')]+ tight = [c for c in checks+ if c['verdict'] == 'tight' and not c.get('alt_mountpoint')]if tight:leftovers = ' and '.join(f'{format_size(c["after"])} {c["resource"]}' for c in tight)sentence += f' Installing it would leave only {leftovers} spare.'+ for c in rescued:+ sentence += (f' The volume at {c["alt_mountpoint"]} has '+ f'{format_size(c["alt_free"])} free — point the '+ f"app's data there and it fits.")if headroom.get('stale'):sentence += ' These readings are more than 15 minutes old.'@@ -245,6 +280,20 @@ def _local_headroom():})except Exception: # noqa: BLE001 — a probe failure is "unknown", not fatallogger.warning('capacity: could not read local host usage', exc_info=True)+ return result+ try:+ # The other real filesystems on this box — an attached volume can hold+ # data the measured mountpoint can't, and the verdict must know that+ # before declaring "no room" (see _apply_other_mounts).+ measured = os.path.normpath(mountpoint) if mountpoint else None+ result['other_mounts'] = [+ {'mountpoint': fs['mountpoint'], 'free': fs['free'],+ 'total': fs['total']}+ for fs in host_inventory_service.enumerate_filesystems()+ if os.path.normpath(fs['mountpoint']) != measured+ ]+ except Exception: # noqa: BLE001 — no volumes known is just an empty list+ logger.debug('capacity: could not enumerate filesystems', exc_info=True)return resultdiff --git a/backend/tests/test_capacity_preflight.py b/backend/tests/test_capacity_preflight.pyindex e5f0df9b..e4ab2864 100644--- a/backend/tests/test_capacity_preflight.py+++ b/backend/tests/test_capacity_preflight.py@@ -259,6 +259,76 @@ class TestEndpoint:assert res.status_code == 401+class TestAttachedVolumes:+ """A disk shortfall on ONE filesystem is not "no room" on a box with a+ volume attached — the app's data can live there. Red must mean the whole+ box is short, not that the measured mountpoint is."""++ @staticmethod+ def _headroom(disk_free, other_mounts, memory_free=6 * GB):+ return {'server_id': None, 'name': 'This server', 'source': 'local',+ 'measured_at': '2026-08-28T00:00:00Z', 'stale': False,+ 'memory_total': 8 * GB, 'memory_free': memory_free,+ 'disk_total': 25 * GB, 'disk_free': disk_free,+ 'disk_mountpoint': '/', 'other_mounts': other_mounts}++ def test_a_volume_with_room_downgrades_wont_fit_to_tight(self, app, monkeypatch):+ # The reported bug: 20 GB storage vs 10 GB free on root read as a red+ # "doesn't have room" while an 80 GB volume sat attached and empty.+ monkeypatch.setattr(capacity_service, 'server_headroom',+ lambda server_id=None: self._headroom(+ 10 * GB,+ [{'mountpoint': '/mnt/volume1',+ 'free': 80 * GB, 'total': 100 * GB}]))+ result = check_fit(_template('4GB', '20GB'))+ assert result['verdict'] == 'tight'+ assert 'attached volume' in result['headline']+ assert '/mnt/volume1' in result['detail']+ assert "point the app's data there" in result['detail']+ disk = next(c for c in result['checks'] if c['resource'] == 'disk')+ assert disk['alt_mountpoint'] == '/mnt/volume1'+ assert disk['alt_free'] == 80 * GB++ def test_a_volume_too_small_does_not_rescue(self, app, monkeypatch):+ monkeypatch.setattr(capacity_service, 'server_headroom',+ lambda server_id=None: self._headroom(+ 10 * GB,+ [{'mountpoint': '/mnt/volume1',+ 'free': 15 * GB, 'total': 100 * GB}]))+ result = check_fit(_template('4GB', '20GB'))+ assert result['verdict'] == 'insufficient'+ assert 'more disk than it has free' in result['detail']++ def test_memory_has_no_escape_hatch(self, app, monkeypatch):+ # A volume holds files, not processes; a memory shortfall stays red.+ monkeypatch.setattr(capacity_service, 'server_headroom',+ lambda server_id=None: self._headroom(+ 22 * GB,+ [{'mountpoint': '/mnt/volume1',+ 'free': 80 * GB, 'total': 100 * GB}],+ memory_free=2 * GB))+ result = check_fit(_template('4GB', '20GB'))+ assert result['verdict'] == 'insufficient'++ def test_local_headroom_reports_the_other_mounts(self, app, monkeypatch):+ from collections import namedtuple+ from app.services import host_inventory_service+ Usage = namedtuple('Usage', 'total used free percent')+ monkeypatch.setattr(host_inventory_service, 'data_path_usage',+ lambda: ('/', Usage(25 * GB, 15 * GB, 10 * GB, 60.0)))+ monkeypatch.setattr(host_inventory_service, 'enumerate_filesystems',+ lambda: [+ {'mountpoint': '/', 'device': '/dev/vda1',+ 'free': 10 * GB, 'total': 25 * GB},+ {'mountpoint': '/mnt/volume1', 'device': '/dev/sda',+ 'free': 80 * GB, 'total': 100 * GB},+ ])+ headroom = capacity_service.server_headroom(None)+ # The measured mountpoint is excluded — it is already `disk_free`.+ assert headroom['other_mounts'] == [+ {'mountpoint': '/mnt/volume1', 'free': 80 * GB, 'total': 100 * GB}]++class TestLocalHost:def test_reads_the_panel_host_live(self, app):# The single-server case: no agent, no metrics row, psutil instead —