Skip to content

Fix OTBR migration script hanging when no settings to migrate #4482

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

Draft
craigrallen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix OTBR migration script hanging when no settings to migrate #4482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions openthread_border_router/rootfs/usr/local/bin/migrate_otbr_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,10 @@ async def main() -> None:
if flow_control == "none":
flow_control = None

# First, read the hardware address of the new adapter
hwaddr = await get_adapter_hardware_addr(
port=args.adapter,
baudrate=args.baudrate,
flow_control=flow_control,
)

# Then, look at existing settings
# First, look at existing settings before touching the adapter.
# If there is nothing to migrate, skip the adapter connection entirely.
# This avoids a TimeoutError / AssertionError on dongles that reset their
# USB connection in response to a Spinel RESET (issue #4475).
all_settings = []

for settings_path in args.data_dir.glob("*.data"):
Expand All @@ -184,6 +180,13 @@ async def main() -> None:
print("No existing settings files found, skipping")
return

# Only connect to the adapter if there are settings files that need migrating
hwaddr = await get_adapter_hardware_addr(
port=args.adapter,
baudrate=args.baudrate,
flow_control=flow_control,
)

most_recent_settings_info = sorted(all_settings, reverse=True)[0]
most_recent_settings_path = most_recent_settings_info[1]
most_recent_settings = most_recent_settings_info[2]
Expand Down