jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-28 03:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only update HW condition at once (#3868)

Browse Source 
* Only update HW condition at once

* extend logging
This commit is contained in:
Pascal Vizeli 2022-09-15 22:18:14 +02:00 committed by GitHub
parent b8249548ae
commit 2f4e06aadf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
supervisor/docker/addon.py
View File

@ -40,7 +40,7 @@ from ..exceptions import (
) )
from ..hardware.const import PolicyGroup from ..hardware.const import PolicyGroup
from ..hardware.data import Device from ..hardware.data import Device
from ..jobs.decorator import Job, JobCondition from ..jobs.decorator import Job, JobCondition, JobExecutionLimit
from ..resolution.const import ContextType, IssueType, SuggestionType from ..resolution.const import ContextType, IssueType, SuggestionType
from ..utils import process_lock from ..utils import process_lock
from .const import ( from .const import (
@ -694,7 +694,7 @@ class DockerAddon(DockerInterface):
) )
job.result() job.result()
@Job(conditions=[JobCondition.OS_AGENT]) @Job(conditions=[JobCondition.OS_AGENT], limit=JobExecutionLimit.SINGLE_WAIT)
async def _hardware_events(self, device: Device) -> None: async def _hardware_events(self, device: Device) -> None:
"""Process Hardware events for adjust device access.""" """Process Hardware events for adjust device access."""
if not any( if not any(
@ -716,15 +716,19 @@ class DockerAddon(DockerInterface):
f"Can't process Hardware Event on {self.name}: {err!s}", _LOGGER.error f"Can't process Hardware Event on {self.name}: {err!s}", _LOGGER.error
) from err ) from err
permission = self.sys_hardware.policy.get_cgroups_rule(device)
try: try:
await self.sys_dbus.agent.cgroup.add_devices_allowed( await self.sys_dbus.agent.cgroup.add_devices_allowed(
docker_container.id, self.sys_hardware.policy.get_cgroups_rule(device) docker_container.id, permission
) )
_LOGGER.info( _LOGGER.info(
"Added cgroup permissions for device %s to %s", device.path, self.name "Added cgroup permissions '%s' for device %s to %s",
permission,
device.path,
self.name,
) )
except DBusError as err: except DBusError as err:
raise DockerError( raise DockerError(
f"Can't set cgroup permission on the host for {self.name}", f"Can't set cgroup permission '{permission}' on the host for {self.name}",
_LOGGER.error, _LOGGER.error,
) from err ) from err