Merge tag 'refs/tags/2025.05.5'

al-one · al-one · commit 4ebef9b96dca · 2025-06-17T18:32:37.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,6 @@ ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
 ENV \
-    S6_READ_ONLY_ROOT=1 \
     S6_SERVICES_GRACETIME=10000 \
     SUPERVISOR_API=http://localhost \
     CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1 \
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools~=80.8.0", "wheel~=0.46.1"]
+requires = ["setuptools~=80.9.0", "wheel~=0.46.1"]
 build-backend = "setuptools.build_meta"
 
 [project]
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 aiodns==3.4.0
-aiohttp==3.11.18
+aiohttp==3.12.4
 atomicwrites-homeassistant==1.4.1
 attrs==25.3.0
 awesomeversion==24.6.0
@@ -8,7 +8,7 @@ brotli==1.1.0
 ciso8601==2.3.2
 colorlog==6.9.0
 cpe==1.3.1
-cryptography==45.0.2
+cryptography==45.0.3
 debugpy==1.8.14
 deepmerge==2.0
 dirhash==0.5.0
@@ -24,7 +24,7 @@ PyYAML==6.0.2
 requests==2.32.3
 securetar==2025.2.1
 sentry-sdk==2.29.1
-setuptools==80.8.0
+setuptools==80.9.0
 voluptuous==0.15.2
 dbus-fast==2.44.1
 zlib-fast==0.2.1
diff --git a/requirements_tests.txt b/requirements_tests.txt
@@ -1,5 +1,5 @@
 astroid==3.3.10
-coverage==7.8.1
+coverage==7.8.2
 pre-commit==4.2.0
 pylint==3.3.7
 pytest-aiohttp==1.1.0
diff --git a/supervisor/__main__.py b/supervisor/__main__.py
@@ -66,8 +66,15 @@ def run_os_startup_check_cleanup() -> None:
     _LOGGER.info("Setting up Supervisor")
     loop.run_until_complete(coresys.core.setup())
 
-    loop.call_soon_threadsafe(loop.create_task, coresys.core.start())
-    loop.call_soon_threadsafe(bootstrap.reg_signal, loop, coresys)
+    bootstrap.register_signal_handlers(loop, coresys)
+
+    try:
+        loop.run_until_complete(coresys.core.start())
+    except Exception as err:  # pylint: disable=broad-except
+        # Supervisor itself is running at this point, just something didn't
+        # start as expected. Log with traceback to get more insights for
+        # such cases.
+        _LOGGER.critical("Supervisor start failed: %s", err, exc_info=True)
 
     try:
         _LOGGER.info("Running Supervisor")
diff --git a/supervisor/bootstrap.py b/supervisor/bootstrap.py
@@ -1,6 +1,7 @@
 """Bootstrap Supervisor."""
 
 # ruff: noqa: T100
+import asyncio
 from importlib import import_module
 import logging
 import os
@@ -284,8 +285,8 @@ def check_environment() -> None:
         _LOGGER.critical("Can't find Docker socket!")
 
 
-def reg_signal(loop, coresys: CoreSys) -> None:
-    """Register SIGTERM and SIGKILL to stop system."""
+def register_signal_handlers(loop: asyncio.BaseEventLoop, coresys: CoreSys) -> None:
+    """Register SIGTERM, SIGHUP and SIGKILL to stop the Supervisor."""
     try:
         loop.add_signal_handler(
             signal.SIGTERM, lambda: loop.create_task(coresys.core.stop())
diff --git a/supervisor/core.py b/supervisor/core.py
@@ -188,7 +188,10 @@ async def setup(self):
                 await setup_task
             except Exception as err:  # pylint: disable=broad-except
                 _LOGGER.critical(
-                    "Fatal error happening on load Task %s: %s", setup_task, err
+                    "Fatal error happening on load Task %s: %s",
+                    setup_task,
+                    err,
+                    exc_info=True,
                 )
                 self.sys_resolution.add_unhealthy_reason(UnhealthyReason.SETUP)
                 await async_capture_exception(err)
@@ -237,10 +240,10 @@ async def start(self):
                     await self.sys_supervisor.update()
                     return
 
-        # Start addon mark as initialize
-        await self.sys_addons.boot(AddonStartup.INITIALIZE)
-
         try:
+            # Start addon mark as initialize
+            await self.sys_addons.boot(AddonStartup.INITIALIZE)
+
             # HomeAssistant is already running, only Supervisor restarted
             if await self.sys_hardware.helper.last_boot() == self.sys_config.last_boot:
                 _LOGGER.info("Detected Supervisor restart")
diff --git a/supervisor/host/const.py b/supervisor/host/const.py
@@ -80,6 +80,7 @@ class LogFormat(StrEnum):
 
     JOURNAL = "application/vnd.fdo.journal"
     JSON = "application/json"
+    JSON_SEQ = "application/json-seq"
     TEXT = "text/plain"
 
 
diff --git a/supervisor/host/logs.py b/supervisor/host/logs.py
@@ -25,6 +25,7 @@
     HostServiceError,
 )
 from ..utils.json import read_json_file
+from ..utils.systemd_journal import journal_boots_reader
 from .const import PARAM_BOOT_ID, PARAM_SYSLOG_IDENTIFIER, LogFormat
 
 _LOGGER: logging.Logger = logging.getLogger(__name__)
@@ -108,12 +109,8 @@ async def get_boot_id(self, offset: int = 0) -> str:
 
         return boot_ids[offset]
 
-    async def get_boot_ids(self) -> list[str]:
-        """Get boot IDs from oldest to newest."""
-        if self._boot_ids:
-            # Doesn't change without a reboot, no reason to query again once cached
-            return self._boot_ids
-
+    async def _get_boot_ids_legacy(self) -> list[str]:
+        """Get boots IDs using suboptimal method where /boots is not available."""
         try:
             async with self.journald_logs(
                 params=BOOT_IDS_QUERY,
@@ -142,13 +139,51 @@ async def get_boot_ids(self) -> list[str]:
                 _LOGGER.error,
             ) from err
 
-        self._boot_ids = []
+        _boot_ids = []
         for entry in text.split("\n"):
-            if (
-                entry
-                and (boot_id := json.loads(entry)[PARAM_BOOT_ID]) not in self._boot_ids
-            ):
-                self._boot_ids.append(boot_id)
+            if entry and (boot_id := json.loads(entry)[PARAM_BOOT_ID]) not in _boot_ids:
+                _boot_ids.append(boot_id)
+
+        return _boot_ids
+
+    async def _get_boot_ids_native(self):
+        """Get boot IDs using /boots endpoint."""
+        try:
+            async with self.journald_logs(
+                path="/boots",
+                accept=LogFormat.JSON_SEQ,
+                timeout=ClientTimeout(total=20),
+            ) as resp:
+                if resp.status != 200:
+                    raise HostLogError(
+                        f"Got HTTP {resp.status} from /boots.",
+                        _LOGGER.debug,
+                    )
+                # Don't rely solely on the order of boots in the response,
+                # sort the boots by index returned in the response.
+                boot_id_tuples = [boot async for boot in journal_boots_reader(resp)]
+                return [
+                    boot_id for _, boot_id in sorted(boot_id_tuples, key=lambda x: x[0])
+                ]
+        except (ClientError, TimeoutError) as err:
+            raise HostLogError(
+                "Could not get a list of boot IDs from systemd-journal-gatewayd",
+                _LOGGER.error,
+            ) from err
+
+    async def get_boot_ids(self) -> list[str]:
+        """Get boot IDs from oldest to newest."""
+        if self._boot_ids:
+            # Doesn't change without a reboot, no reason to query again once cached
+            return self._boot_ids
+
+        try:
+            self._boot_ids = await self._get_boot_ids_native()
+        except HostLogError:
+            _LOGGER.info(
+                "Could not get /boots from systemd-journal-gatewayd, using fallback."
+            )
+            self._boot_ids = await self._get_boot_ids_legacy()
 
         return self._boot_ids
 
diff --git a/supervisor/host/network.py b/supervisor/host/network.py
@@ -158,6 +158,7 @@ async def _check_connectivity_changed(
             DBUS_ATTR_PRIMARY_CONNECTION in changed
             and changed[DBUS_ATTR_PRIMARY_CONNECTION]
             and changed[DBUS_ATTR_PRIMARY_CONNECTION] != DBUS_OBJECT_BASE
+            and await self.sys_plugins.dns.is_running()
         ):
             await self.sys_plugins.dns.restart()
 
diff --git a/supervisor/plugins/dns.py b/supervisor/plugins/dns.py
@@ -211,7 +211,7 @@ async def restart(self) -> None:
         try:
             await self.instance.restart()
         except DockerError as err:
-            raise CoreDNSError("Can't start CoreDNS plugin", _LOGGER.error) from err
+            raise CoreDNSError("Can't restart CoreDNS plugin", _LOGGER.error) from err
 
     async def start(self) -> None:
         """Run CoreDNS."""
diff --git a/supervisor/utils/systemd_journal.py b/supervisor/utils/systemd_journal.py
@@ -1,8 +1,10 @@
 """Utilities for working with systemd journal export format."""
 
+from asyncio import IncompleteReadError
 from collections.abc import AsyncGenerator
 from datetime import UTC, datetime
 from functools import wraps
+import json
 
 from aiohttp import ClientResponse
 
@@ -116,3 +118,35 @@ async def journal_logs_reader(
 
             # strip \n for simple fields before decoding
             entries[name] = data[:-1].decode("utf-8")
+
+
+def _parse_boot_json(boot_json_bytes: bytes) -> tuple[int, str]:
+    boot_dict = json.loads(boot_json_bytes.decode("utf-8"))
+    return (
+        int(boot_dict["index"]),
+        boot_dict["boot_id"],
+    )
+
+
+async def journal_boots_reader(
+    response: ClientResponse,
+) -> AsyncGenerator[tuple[int, str]]:
+    """Read boots from json-seq response from systemd journal gateway.
+
+    Returns generator of (index, boot_id) tuples.
+    """
+    async with response as resp:
+
+        async def read_record() -> bytes:
+            try:
+                return await resp.content.readuntil(b"\x1e")
+            except IncompleteReadError as e:
+                return e.partial
+
+        while line := await read_record():
+            line = line.strip(b"\x1e")
+            if not line:
+                continue
+            yield _parse_boot_json(line)
+
+        return
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -46,6 +46,7 @@
 from supervisor.dbus.network import NetworkManager
 from supervisor.docker.manager import DockerAPI
 from supervisor.docker.monitor import DockerMonitor
+from supervisor.exceptions import HostLogError
 from supervisor.homeassistant.api import APIState
 from supervisor.host.logs import LogsControl
 from supervisor.os.manager import OSManager
@@ -462,6 +463,7 @@ async def response_text():
             return (await client_response.content.read()).decode("utf-8")
 
         client_response.text = response_text
+        client_response.status = 200
 
         get.return_value.__aenter__.return_value = client_response
         get.return_value.__aenter__.return_value.__aenter__.return_value = (
@@ -470,6 +472,20 @@ async def response_text():
         yield client_response
 
 
+@pytest.fixture
+async def without_journal_gatewayd_boots() -> AsyncGenerator[MagicMock]:
+    """Make method using /boots of systemd-journald-gateway fail."""
+
+    def raise_host_log_error_side_effect(*args, **kwargs):
+        raise HostLogError("Mocked error")
+
+    with patch(
+        "supervisor.host.logs.LogsControl._get_boot_ids_native"
+    ) as get_boot_ids_native:
+        get_boot_ids_native.side_effect = raise_host_log_error_side_effect
+        yield get_boot_ids_native
+
+
 @pytest.fixture
 async def journal_logs_reader() -> MagicMock:
     """Mock journal_logs_reader in host API."""
diff --git a/tests/fixtures/systemd_journal_boots.jsons b/tests/fixtures/systemd_journal_boots.jsons
@@ -0,0 +1,5 @@
+{"index":0,"boot_id":"aeaa3d67efe9410ba7210cbee21bb022","first_entry":1748034681901673,"last_entry":1748266575896080}
+{"index":-1,"boot_id":"b81a432efb2d4a71a1e2d1b42892c187","first_entry":1748029923668450,"last_entry":1748034525932010}
+{"index":-2,"boot_id":"3fa78d16a4ee4975b632d24dea52404c","first_entry":1748029753658977,"last_entry":1748029822011659}
+{"index":-3,"boot_id":"2411cf84b38a41939de746afc7a22e18","first_entry":1748029538004767,"last_entry":1748029695950467}
+{"index":-4,"boot_id":"77f66b1fd6b2416e8eebf509c9a470e6","first_entry":1748029186112301,"last_entry":1748029453598350}
diff --git a/tests/host/test_connectivity.py b/tests/host/test_connectivity.py
@@ -2,7 +2,7 @@
 
 # pylint: disable=protected-access
 import asyncio
-from unittest.mock import PropertyMock, patch
+from unittest.mock import AsyncMock, PropertyMock, patch
 
 import pytest
 
@@ -92,7 +92,12 @@ async def test_dns_restart_on_connection_change(
 ):
     """Test dns plugin is restarted when primary connection changes."""
     await coresys.host.network.load()
-    with patch.object(PluginDns, "restart") as restart:
+    with (
+        patch.object(PluginDns, "restart") as restart,
+        patch.object(
+            PluginDns, "is_running", new_callable=AsyncMock, return_value=True
+        ),
+    ):
         network_manager_service.emit_properties_changed({"PrimaryConnection": "/"})
         await network_manager_service.ping()
         restart.assert_not_called()
diff --git a/tests/host/test_logs.py b/tests/host/test_logs.py
@@ -20,6 +20,14 @@
     "b1c386a144fd44db8f855d7e907256f8",
 ]
 
+TEST_BOOTS_IDS_NATIVE = [
+    "77f66b1fd6b2416e8eebf509c9a470e6",
+    "2411cf84b38a41939de746afc7a22e18",
+    "3fa78d16a4ee4975b632d24dea52404c",
+    "b81a432efb2d4a71a1e2d1b42892c187",
+    "aeaa3d67efe9410ba7210cbee21bb022",
+]
+
 
 async def test_load(coresys: CoreSys):
     """Test load."""
@@ -82,7 +90,11 @@ async def test_logs_coloured(journald_gateway: MagicMock, coresys: CoreSys):
         )
 
 
-async def test_boot_ids(journald_gateway: MagicMock, coresys: CoreSys):
+async def test_boot_ids(
+    journald_gateway: MagicMock,
+    coresys: CoreSys,
+    without_journal_gatewayd_boots: MagicMock,
+):
     """Test getting boot ids."""
     journald_gateway.content.feed_data(
         load_fixture("logs_boot_ids.txt").encode("utf-8")
@@ -109,7 +121,11 @@ async def test_boot_ids(journald_gateway: MagicMock, coresys: CoreSys):
         await coresys.host.logs.get_boot_id(3)
 
 
-async def test_boot_ids_fallback(journald_gateway: MagicMock, coresys: CoreSys):
+async def test_boot_ids_legacy_fallback(
+    journald_gateway: MagicMock,
+    coresys: CoreSys,
+    without_journal_gatewayd_boots: MagicMock,
+):
     """Test getting boot ids using fallback."""
     # Initial response has no log lines
     journald_gateway.content.feed_data(b"")
@@ -134,6 +150,16 @@ def get_side_effect(*args, **kwargs):
     ]
 
 
+async def test_boot_ids_native(journald_gateway: MagicMock, coresys: CoreSys):
+    """Test getting boot ids from /boots endpoint."""
+    journald_gateway.content.feed_data(
+        load_fixture("systemd_journal_boots.jsons").encode("utf-8")
+    )
+    journald_gateway.content.feed_eof()
+
+    assert await coresys.host.logs.get_boot_ids() == TEST_BOOTS_IDS_NATIVE
+
+
 async def test_identifiers(journald_gateway: MagicMock, coresys: CoreSys):
     """Test getting identifiers."""
     journald_gateway.content.feed_data(
diff --git a/tests/utils/test_systemd_journal.py b/tests/utils/test_systemd_journal.py
