StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1170 from ogayot/FR-1983 

Fix hanging when network is the last postinst model configured
This commit is contained in:
Michael Hudson-Doyle 2022-01-21 10:25:54 +13:00 committed by GitHub
parent f0907971ed 37f286ac93
commit 56ddf178e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
subiquity/models/subiquity.py
View File

@ -18,6 +18,7 @@ from collections import OrderedDict
import functools import functools
import logging import logging
import os import os
from typing import Set
import uuid import uuid
import yaml import yaml
@ -190,23 +191,27 @@ class SubiquityModel:
self._postinstall_event.set() self._postinstall_event.set()
def _configured(self, model_name): def _configured(self, model_name):
""" Add the model to the set of models that have been configured. If
there is no more model to configure in the relevant section(s) (i.e.,
INSTALL or POSTINSTALL), we trigger the associated event(s). """
def log_and_trigger(stage: str, names: Set[str],
event: asyncio.Event) -> None:
unconfigured = names - self._configured_names
log.debug(
"model %s for %s stage is configured, to go %s",
model_name, stage, unconfigured)
if not unconfigured:
event.set()
self._configured_names.add(model_name) self._configured_names.add(model_name)
if model_name in self._cur_install_model_names: if model_name in self._cur_install_model_names:
stage = 'install' log_and_trigger(stage="install",
names = self._cur_install_model_names names=self._cur_install_model_names,
event = self._install_event event=self._install_event)
elif model_name in self._cur_postinstall_model_names: if model_name in self._cur_postinstall_model_names:
stage = 'postinstall' log_and_trigger(stage="postinstall",
names = self._cur_postinstall_model_names names=self._cur_postinstall_model_names,
event = self._postinstall_event event=self._postinstall_event)
else:
return
unconfigured = names - self._configured_names
log.debug(
"model %s for %s stage is configured, to go %s",
model_name, stage, unconfigured)
if not unconfigured:
event.set()
async def wait_install(self): async def wait_install(self):
if len(self._cur_install_model_names) == 0: if len(self._cur_install_model_names) == 0: