Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

curtin / block-probe: pick up risc-v fixes for Jammy #1262

Merged
merged 2 commits into from
Apr 12, 2022
Merged

curtin / block-probe: pick up risc-v fixes for Jammy #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6abe4fd
riscv: extend block probing timeout
dbungert Mar 10, 2022
ae55514
snapcraft: update curtin for risc-v
dbungert Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion subiquity/server/controllers/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import json
import logging
import os
import platform
import select
from typing import List

Expand Down Expand Up @@ -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)
Expand Down