From 6abe4fd82e283406516e83e778713c172d3a7ecf Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 10 Mar 2022 14:07:52 -0700 Subject: [PATCH 1/2] riscv: extend block probing timeout --- subiquity/server/controllers/filesystem.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py index 79def7d87..4820942b4 100644 --- a/subiquity/server/controllers/filesystem.py +++ b/subiquity/server/controllers/filesystem.py @@ -18,6 +18,7 @@ import json import logging import os +import platform import select from typing import List @@ -427,7 +428,12 @@ async def _probe(self, *, context=None): # We wait on the task directly here, not # self._probe_once_task.wait as if _probe_once_task # gets cancelled, we should be cancelled too. - await asyncio.wait_for(self._probe_once_task.task, 15.0) + if platform.machine() == 'riscv64': + # 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: # asyncio.CancelledError is a subclass of Exception in # Python 3.6 (sadface) From ae555140576dc2d3bc3913077e5d6de4e70438bb Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 8 Apr 2022 11:54:44 -0600 Subject: [PATCH 2/2] snapcraft: update curtin for risc-v --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index e00005dac..d0f12024e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -44,7 +44,7 @@ parts: plugin: python source-type: git source: https://git.launchpad.net/curtin - source-commit: bfbba202e2cc3b02e4e3953081effb6768da41a8 + source-commit: a74424850379e2cd2e19b437a3f0e60aae374958 build-packages: - shared-mime-info - zlib1g-dev