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

Merge pull request #1590 from dbungert/block-probing-timeouts 

storage: lengthen and log probing time
This commit is contained in:
Dan Bungert 2023-03-08 12:35:31 -07:00 committed by GitHub
parent 79c38b086d 9d78aed696
commit f24c76bc50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
subiquity/server/controllers/filesystem.py
View File

@ -20,8 +20,8 @@ import json
import logging import logging
import os import os
import pathlib import pathlib
import platform
import select import select
import time
from typing import Dict, List, Optional from typing import Dict, List, Optional
from curtin.storage_config import ptable_uuid_to_flag_entry from curtin.storage_config import ptable_uuid_to_flag_entry
@ -828,22 +828,18 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
@with_context() @with_context()
async def _probe(self, *, context=None): async def _probe(self, *, context=None):
self._errors = {} self._errors = {}
for (restricted, kind) in [ for (restricted, kind, short_label) in [
(False, ErrorReportKind.BLOCK_PROBE_FAIL), (False, ErrorReportKind.BLOCK_PROBE_FAIL, "block"),
(True, ErrorReportKind.DISK_PROBE_FAIL), (True, ErrorReportKind.DISK_PROBE_FAIL, "disk"),
]: ]:
try: try:
start = time.time()
await self._probe_once_task.start( await self._probe_once_task.start(
context=context, restricted=restricted) context=context, restricted=restricted)
# We wait on the task directly here, not # We wait on the task directly here, not
# self._probe_once_task.wait as if _probe_once_task # self._probe_once_task.wait as if _probe_once_task
# gets cancelled, we should be cancelled too. # gets cancelled, we should be cancelled too.
if platform.machine() == 'riscv64': await asyncio.wait_for(self._probe_once_task.task, 90.0)
# block probing is taking much longer on RISC-V - but why?
timeout = 60.0
else:
timeout = 15.0
await asyncio.wait_for(self._probe_once_task.task, timeout)
except asyncio.CancelledError: except asyncio.CancelledError:
# asyncio.CancelledError is a subclass of Exception in # asyncio.CancelledError is a subclass of Exception in
# Python 3.6 (sadface) # Python 3.6 (sadface)
@ -855,6 +851,9 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
if report is not None: if report is not None:
self._errors[restricted] = (exc, report) self._errors[restricted] = (exc, report)
continue continue
finally:
elapsed = time.time() - start
log.debug(f'{short_label} probing took {elapsed:.1f} seconds')
break break
def run_autoinstall_guided(self, layout): def run_autoinstall_guided(self, layout):