mirror of
https://github.com/home-assistant/supervisor.git
synced 2025-07-21 08:06:30 +00:00
Improve supported / healthy handling and more checks (#1905)
Co-authored-by: Joakim Sørensen <joasoe@gmail.com>
This commit is contained in:
parent
00969a67ac
commit
8d7b15cbeb
@ -39,7 +39,7 @@ class APIHost(CoreSysAttributes):
|
||||
return {
|
||||
ATTR_CHASSIS: self.sys_host.info.chassis,
|
||||
ATTR_CPE: self.sys_host.info.cpe,
|
||||
ATTR_FEATURES: self.sys_host.supperted_features,
|
||||
ATTR_FEATURES: self.sys_host.supported_features,
|
||||
ATTR_HOSTNAME: self.sys_host.info.hostname,
|
||||
ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
|
||||
ATTR_DEPLOYMENT: self.sys_host.info.deployment,
|
||||
|
@ -39,7 +39,7 @@ class APIInfo(CoreSysAttributes):
|
||||
ATTR_MACHINE: self.sys_machine,
|
||||
ATTR_ARCH: self.sys_arch.default,
|
||||
ATTR_SUPPORTED_ARCH: self.sys_arch.supported,
|
||||
ATTR_SUPPORTED: self.sys_supported,
|
||||
ATTR_SUPPORTED: self.sys_core.supported,
|
||||
ATTR_CHANNEL: self.sys_updater.channel,
|
||||
ATTR_LOGGING: self.sys_config.logging,
|
||||
ATTR_TIMEZONE: self.sys_timezone,
|
||||
|
@ -100,7 +100,7 @@ class APISupervisor(CoreSysAttributes):
|
||||
ATTR_VERSION_LATEST: self.sys_updater.version_supervisor,
|
||||
ATTR_CHANNEL: self.sys_updater.channel,
|
||||
ATTR_ARCH: self.sys_supervisor.arch,
|
||||
ATTR_SUPPORTED: self.sys_supported,
|
||||
ATTR_SUPPORTED: self.sys_core.supported,
|
||||
ATTR_HEALTHY: self.sys_core.healthy,
|
||||
ATTR_IP_ADDRESS: str(self.sys_supervisor.ip_address),
|
||||
ATTR_WAIT_BOOT: self.sys_config.wait_boot,
|
||||
|
@ -329,6 +329,8 @@ ROLE_ALL = [ROLE_DEFAULT, ROLE_HOMEASSISTANT, ROLE_BACKUP, ROLE_MANAGER, ROLE_AD
|
||||
CHAN_ID = "chan_id"
|
||||
CHAN_TYPE = "chan_type"
|
||||
|
||||
SUPERVISED_SUPPORTED_OS = ["Debian GNU/Linux 10 (buster)"]
|
||||
|
||||
|
||||
class AddonStartup(str, Enum):
|
||||
"""Startup types of Add-on."""
|
||||
|
@ -5,7 +5,7 @@ import logging
|
||||
|
||||
import async_timeout
|
||||
|
||||
from .const import SOCKET_DBUS, AddonStartup, CoreStates
|
||||
from .const import SOCKET_DBUS, SUPERVISED_SUPPORTED_OS, AddonStartup, CoreStates
|
||||
from .coresys import CoreSys, CoreSysAttributes
|
||||
from .exceptions import HassioError, HomeAssistantError, SupervisorUpdateError
|
||||
|
||||
@ -19,12 +19,8 @@ class Core(CoreSysAttributes):
|
||||
"""Initialize Supervisor object."""
|
||||
self.coresys: CoreSys = coresys
|
||||
self.state: CoreStates = CoreStates.INITIALIZE
|
||||
self._healthy: bool = True
|
||||
|
||||
@property
|
||||
def healthy(self) -> bool:
|
||||
"""Return True if system is healthy."""
|
||||
return self._healthy and self.sys_supported
|
||||
self.healthy: bool = True
|
||||
self.supported: bool = True
|
||||
|
||||
async def connect(self):
|
||||
"""Connect Supervisor container."""
|
||||
@ -32,23 +28,25 @@ class Core(CoreSysAttributes):
|
||||
|
||||
# If host docker is supported?
|
||||
if not self.sys_docker.info.supported_version:
|
||||
self.coresys.supported = False
|
||||
self.supported = False
|
||||
self.healthy = False
|
||||
_LOGGER.error(
|
||||
"Docker version %s is not supported by Supervisor!",
|
||||
self.sys_docker.info.version,
|
||||
)
|
||||
elif self.sys_docker.info.inside_lxc:
|
||||
self.coresys.supported = False
|
||||
self.supported = False
|
||||
self.healthy = False
|
||||
_LOGGER.error(
|
||||
"Detected Docker running inside LXC. Running Home Assistant with the Supervisor on LXC is not supported!"
|
||||
)
|
||||
|
||||
if self.sys_docker.info.check_requirements():
|
||||
self.coresys.supported = False
|
||||
self.supported = False
|
||||
|
||||
# Dbus available
|
||||
if not SOCKET_DBUS.exists():
|
||||
self.coresys.supported = False
|
||||
self.supported = False
|
||||
_LOGGER.error(
|
||||
"DBus is required for Home Assistant. This system is not supported!"
|
||||
)
|
||||
@ -60,13 +58,13 @@ class Core(CoreSysAttributes):
|
||||
self.sys_config.version == "dev"
|
||||
or self.sys_supervisor.instance.version == "dev"
|
||||
):
|
||||
self.coresys.supported = False
|
||||
self.supported = False
|
||||
_LOGGER.warning(
|
||||
"Found a development supervisor outside dev channel (%s)",
|
||||
self.sys_updater.channel,
|
||||
)
|
||||
elif self.sys_config.version != self.sys_supervisor.version:
|
||||
self._healthy = False
|
||||
self.healthy = False
|
||||
_LOGGER.error(
|
||||
"Update %s of Supervisor %s fails!",
|
||||
self.sys_config.version,
|
||||
@ -122,13 +120,37 @@ class Core(CoreSysAttributes):
|
||||
# Load secrets
|
||||
await self.sys_secrets.load()
|
||||
|
||||
# Check supported OS
|
||||
if not self.sys_hassos.available:
|
||||
if self.sys_host.info.operating_system not in SUPERVISED_SUPPORTED_OS:
|
||||
self.supported = False
|
||||
_LOGGER.error(
|
||||
"Using '%s' as the OS is not supported",
|
||||
self.sys_host.info.operating_system,
|
||||
)
|
||||
else:
|
||||
# Check rauc connectivity on our OS
|
||||
if not self.sys_dbus.rauc.is_connected:
|
||||
self.healthy = False
|
||||
|
||||
# Check all DBUS connectivity
|
||||
if not self.sys_dbus.hostname.is_connected:
|
||||
self.supported = False
|
||||
_LOGGER.error("Hostname DBUS is not connected")
|
||||
if not self.sys_dbus.nmi_dns.is_connected:
|
||||
self.supported = False
|
||||
_LOGGER.error("NetworkManager DNS DBUS is not connected")
|
||||
if not self.sys_dbus.systemd.is_connected:
|
||||
self.supported = False
|
||||
_LOGGER.error("Systemd DBUS is not connected")
|
||||
|
||||
async def start(self):
|
||||
"""Start Supervisor orchestration."""
|
||||
self.state = CoreStates.STARTUP
|
||||
await self.sys_api.start()
|
||||
|
||||
# Check if system is healthy
|
||||
if not self.sys_supported:
|
||||
if not self.supported:
|
||||
_LOGGER.critical("System running in a unsupported environment!")
|
||||
elif not self.healthy:
|
||||
_LOGGER.critical(
|
||||
|
@ -48,9 +48,6 @@ class CoreSys:
|
||||
self._machine_id: Optional[str] = None
|
||||
self._machine: Optional[str] = None
|
||||
|
||||
# Static attributes
|
||||
self.supported: bool = True
|
||||
|
||||
# External objects
|
||||
self._loop: asyncio.BaseEventLoop = asyncio.get_running_loop()
|
||||
self._websession: aiohttp.ClientSession = aiohttp.ClientSession()
|
||||
@ -462,11 +459,6 @@ class CoreSysAttributes:
|
||||
"""Return True if we run dev mode."""
|
||||
return self.coresys.dev
|
||||
|
||||
@property
|
||||
def sys_supported(self) -> bool:
|
||||
"""Return True if the system is supported."""
|
||||
return self.coresys.supported
|
||||
|
||||
@property
|
||||
def sys_timezone(self) -> str:
|
||||
"""Return timezone."""
|
||||
|
@ -66,7 +66,7 @@ class HostManager(CoreSysAttributes):
|
||||
return self._sound
|
||||
|
||||
@property
|
||||
def supperted_features(self):
|
||||
def supported_features(self):
|
||||
"""Return a list of supported host features."""
|
||||
features = []
|
||||
|
||||
|
@ -28,7 +28,7 @@ class HwMonitor(CoreSysAttributes):
|
||||
self.monitor = pyudev.Monitor.from_netlink(self.context)
|
||||
self.observer = pyudev.MonitorObserver(self.monitor, self._udev_events)
|
||||
except OSError:
|
||||
self.coresys.supported = False
|
||||
self.sys_core.healthy = False
|
||||
_LOGGER.critical("Not privileged to run udev monitor!")
|
||||
else:
|
||||
self.observer.start()
|
||||
|
Loading…
x
Reference in New Issue
Block a user