github
/
ha-supervisor
mirror of https://github.com/home-assistant/supervisor
1
Fork 0
Code Releases Activity

Add jobs to docker supervisor and use group wait (#4520)

This commit is contained in:
Mike Degatano 2023-09-03 12:22:17 -04:00 committed by GitHub
parent f30d21361f
commit 07c2178ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
supervisor/docker/interface.py
View File

@ -334,11 +334,7 @@ class DockerInterface(JobGroup):
return _container_state_from_model(docker_container)
@Job(
name="docker_interface_attach",
limit=JobExecutionLimit.GROUP_ONCE,
on_condition=DockerJobError,
)
@Job(name="docker_interface_attach", limit=JobExecutionLimit.GROUP_WAIT)
async def attach(
self, version: AwesomeVersion, *, skip_state_event_if_down: bool = False
) -> None:
@ -454,11 +450,7 @@ class DockerInterface(JobGroup):
return b""
@Job(
name="docker_interface_cleanup",
limit=JobExecutionLimit.GROUP_ONCE,
on_condition=DockerJobError,
)
@Job(name="docker_interface_cleanup", limit=JobExecutionLimit.GROUP_WAIT)
def cleanup(self, old_image: str | None = None) -> Awaitable[None]:
"""Check if old version exists and cleanup."""
return self.sys_run_in_executor(

13
supervisor/docker/supervisor.py
View File

@ -8,8 +8,7 @@ from awesomeversion.awesomeversion import AwesomeVersion
import docker
import requests
from ..coresys import CoreSysAttributes
from ..exceptions import DockerError, DockerJobError
from ..exceptions import DockerError
from ..jobs.const import JobExecutionLimit
from ..jobs.decorator import Job
from .const import PropagationMode
@ -18,7 +17,7 @@ from .interface import DockerInterface
_LOGGER: logging.Logger = logging.getLogger(__name__)
class DockerSupervisor(DockerInterface, CoreSysAttributes):
class DockerSupervisor(DockerInterface):
"""Docker Supervisor wrapper for Supervisor."""
@property
@ -45,11 +44,7 @@ class DockerSupervisor(DockerInterface, CoreSysAttributes):
if mount.get("Destination") == "/data"
)
@Job(
name="docker_supervisor_attach",
limit=JobExecutionLimit.GROUP_ONCE,
on_condition=DockerJobError,
)
@Job(name="docker_supervisor_attach", limit=JobExecutionLimit.GROUP_WAIT)
async def attach(
self, version: AwesomeVersion, *, skip_state_event_if_down: bool = False
) -> None:
@ -81,6 +76,7 @@ class DockerSupervisor(DockerInterface, CoreSysAttributes):
ipv4=self.sys_docker.network.supervisor,
)
@Job(name="docker_supervisor_retag", limit=JobExecutionLimit.GROUP_WAIT)
def retag(self) -> Awaitable[None]:
"""Retag latest image to version."""
return self.sys_run_in_executor(self._retag)
@ -100,6 +96,7 @@ class DockerSupervisor(DockerInterface, CoreSysAttributes):
f"Can't retag Supervisor version: {err}", _LOGGER.error
) from err
@Job(name="docker_supervisor_update_start_tag", limit=JobExecutionLimit.GROUP_WAIT)
def update_start_tag(self, image: str, version: AwesomeVersion) -> Awaitable[None]:
"""Update start tag to new version."""
return self.sys_run_in_executor(self._update_start_tag, image, version)