Skip to content

autopilot manager: fix auto_restart_autopilot() race condition #3401

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.

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

Merged

Conversation

Williangalvani
Copy link
Member

@Williangalvani Williangalvani commented Jun 30, 2025

fix #3400

needs testing tested by @vshie

Summary by Sourcery

Bug Fixes:

  • Catch psutil.NoSuchProcess in is_ardupilot_process to avoid race condition when inspecting process cmdline.

Summary by Sourcery

Bug Fixes:

  • Catch psutil.NoSuchProcess exceptions in is_ardupilot_process to prevent failures when a process ends before cmdline() is called.

Copy link

sourcery-ai bot commented Jun 30, 2025

Reviewer's Guide

Wrapped the process cmdline lookup in a try/except block to catch and ignore psutil.NoSuchProcess errors, preventing race conditions when inspecting terminated processes.

Class diagram for updated is_ardupilot_process function

classDiagram
    class AutopilotManager {
        +is_ardupilot_process(process: psutil.Process) bool
    }
    class psutil_Process {
        +cmdline() list
    }
    AutopilotManager --|> psutil_Process : uses
    AutopilotManager : +try/except psutil.NoSuchProcess
    AutopilotManager : +ignore process if NoSuchProcess
Loading

File-Level Changes

Change Details Files
Add exception handling around cmdline inspection to avoid racing on process exit
  • Wrap firmware_path string check in a try/except
  • Catch psutil.NoSuchProcess and silently continue
core/services/ardupilot_manager/autopilot_manager.py

Assessment against linked issues

Issue Objective Addressed Explanation

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@Williangalvani Williangalvani marked this pull request as ready for review July 1, 2025 21:47
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @Williangalvani - I've reviewed your changes - here's some feedback:

  • Consider logging the caught NoSuchProcess at debug level so you can monitor how often this race condition occurs.
  • You could use psutil.process_iter(attrs=['cmdline']) to fetch cmdline in bulk and shrink the race window instead of calling process.cmdline() per process.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider logging the caught NoSuchProcess at debug level so you can monitor how often this race condition occurs.
- You could use psutil.process_iter(attrs=['cmdline']) to fetch cmdline in bulk and shrink the race window instead of calling process.cmdline() per process.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

if str(firmware_path) in " ".join(process.cmdline()):
return True
try:
if str(firmware_path) in " ".join(process.cmdline()):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so.. shouldn't this check for is_running ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes that should work! will need re-testing though

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm there would still be a chance, though. of the process stopping existing between the is_running() check and the cmdline() call.

@patrickelectric patrickelectric merged commit 528e5c2 into bluerobotics:master Jul 2, 2025
6 checks passed
@Williangalvani Williangalvani deleted the fix_race_condition branch July 2, 2025 17:01
@Williangalvani Williangalvani added the move-to-stable Needs to be cherry-picked and move to stable label Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
move-to-stable Needs to be cherry-picked and move to stable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[autopilot-manager] Race condition at auto_restart_ardupilot()
2 participants