riscv: extend block probing timeout
This commit is contained in:
parent
510d63d93d
commit
119f17b362
|
@ -18,6 +18,7 @@ import glob
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import platform
|
||||||
import select
|
import select
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
|
@ -431,7 +432,12 @@ class FilesystemController(SubiquityController, FilesystemManipulator):
|
||||||
# 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.
|
||||||
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:
|
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)
|
||||||
|
|
Loading…
Reference in New Issue