Make startup more stable (#2167)

supervisor/api/__init__.py

@@ -79,6 +79,8 @@ class RestAPI(CoreSysAttributes):
         self._register_snapshots()
         self._register_supervisor()
 
+        await self.start()
+
     def _register_host(self) -> None:
         """Register hostcontrol functions."""
         api_host = APIHost()

supervisor/core.py

@@ -2,7 +2,7 @@
 import asyncio
 from contextlib import suppress
 import logging
-from typing import Optional
+from typing import Awaitable, List, Optional
 
 import async_timeout
 
@@ -112,51 +112,49 @@ class Core(CoreSysAttributes):
         """Start setting up supervisor orchestration."""
         self.state = CoreState.SETUP
 
-        # rest api views
+        setup_loads: List[Awaitable[None]] = [
-        await self.sys_api.load()
+            # rest api views
-        await self.sys_api.start()
+            self.sys_api.load(),
+            # Load DBus
+            self.sys_dbus.load(),
+            # Load Host
+            self.sys_host.load(),
+            # Load Plugins container
+            self.sys_plugins.load(),
+            # load last available data
+            self.sys_updater.load(),
+            # Load Home Assistant
+            self.sys_homeassistant.load(),
+            # Load CPU/Arch
+            self.sys_arch.load(),
+            # Load HassOS
+            self.sys_hassos.load(),
+            # Load Stores
+            self.sys_store.load(),
+            # Load Add-ons
+            self.sys_addons.load(),
+            # load last available data
+            self.sys_snapshots.load(),
+            # load services
+            self.sys_services.load(),
+            # Load discovery
+            self.sys_discovery.load(),
+            # Load ingress
+            self.sys_ingress.load(),
+            # Load Resoulution
+            self.sys_resolution.load(),
+        ]
 
-        # Load DBus
+        # Execute each load task in secure context
-        await self.sys_dbus.load()
+        for setup_task in setup_loads:
-
+            try:
-        # Load Host
+                await setup_task
-        await self.sys_host.load()
+            except Exception as err:  # pylint: disable=broad-except
-
+                _LOGGER.critical(
-        # Load Plugins container
+                    "Fatal error happening on load Task %s: %s", setup_task, err
-        await self.sys_plugins.load()
+                )
-
+                self.healthy = False
-        # load last available data
+                self.sys_capture_exception(err)
-        await self.sys_updater.load()
-
-        # Load Home Assistant
-        await self.sys_homeassistant.load()
-
-        # Load CPU/Arch
-        await self.sys_arch.load()
-
-        # Load HassOS
-        await self.sys_hassos.load()
-
-        # Load Stores
-        await self.sys_store.load()
-
-        # Load Add-ons
-        await self.sys_addons.load()
-
-        # load last available data
-        await self.sys_snapshots.load()
-
-        # load services
-        await self.sys_services.load()
-
-        # Load discovery
-        await self.sys_discovery.load()
-
-        # Load ingress
-        await self.sys_ingress.load()
-
-        # Load Resoulution
-        await self.sys_resolution.load()
 
         # Check supported OS
         if not self.sys_hassos.available:

tests/conftest.py

@@ -1,6 +1,6 @@
 """Common test functions."""
 from pathlib import Path
-from unittest.mock import MagicMock, PropertyMock, patch
+from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
 from uuid import uuid4
 
 from aiohttp import web
@@ -148,6 +148,7 @@ async def api_client(aiohttp_client, coresys: CoreSys):
     """Fixture for RestAPI client."""
     api = RestAPI(coresys)
     api.webapp = web.Application()
+    api.start = AsyncMock()
     await api.load()
     yield await aiohttp_client(api.webapp)