rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 19:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

controller: don't strand the API stopped on a failed primary unmount

Browse source 
Review feedback: skip the service stop when the primary mount is already
unmounted (a no-op request must not cause an API outage), and restart
wrolpi-api (best effort) when umount fails since the drive is still
mounted and usable.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Roland 2026-07-23 19:17:09 -06:00
parent 43f6ed2b8e
commit f635671266
No known key found for this signature in database
GPG key ID: 1BA620CE6C9A4680
2 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
controller/api/disks.py
View file

@ -54,7 +54,7 @@ from controller.lib.smart import (
get_all_smart_status,
is_smart_available,
)
from controller.lib.systemd import stop_service
from controller.lib.systemd import start_service, stop_service
from controller.lib.wrol_mode import require_normal_mode
logger = logging.getLogger(__name__)
@ -274,18 +274,34 @@ def _unmount_primary(normalized: str) -> dict:
reconciler never manages the primary mount, so umount directly. The
/etc/fstab entry is left in place so a reboot restores the mount.
"""
if normalized not in _executor.current_mount_points():
# Nothing to unmount — do not take the API service down for a no-op.
return {
"success": True,
"mount_point": normalized,
"removed_from_fstab": False,
"stopped_services": [],
}
stopped = stop_service("wrolpi-api")
if not stopped.get("success"):
logger.warning("Could not stop wrolpi-api before unmounting %s: %s",
normalized, stopped.get("error"))
if normalized in _executor.current_mount_points():
result = _executor.unmount(normalized)
if not result.ok:
raise HTTPException(
status_code=500,
detail=f"{normalized} is still mounted: {result.error}",
)
result = _executor.unmount(normalized)
if not result.ok:
# The drive is still mounted, so don't leave the API stopped for
# nothing; best effort — the 500 below is the primary signal.
if stopped.get("success"):
restarted = start_service("wrolpi-api")
if not restarted.get("success"):
logger.warning(
"Could not restart wrolpi-api after failed unmount of %s: %s",
normalized, restarted.get("error"))
raise HTTPException(
status_code=500,
detail=f"{normalized} is still mounted: {result.error}",
)
return {
"success": True,