Skip to content

autopilot manager: fix auto_restart_autopilot() race condition #3474

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

Conversation

joaoantoniocardoso
Copy link
Member

@joaoantoniocardoso joaoantoniocardoso commented Aug 8, 2025

This is a backport of #3401 into 1.4

Summary by Sourcery

Bug Fixes:

  • Wrap process.cmdline() call in a try/except to prevent crashes when the process terminates before inspection

Copy link

sourcery-ai bot commented Aug 8, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Backport race condition fix for autopilot manager by adding exception handling around process.cmdline() to gracefully handle Psutil NoSuchProcess errors.

Class diagram for updated is_ardupilot_process logic

classDiagram
    class AutopilotManager {
        firmware_manager: FirmwareManager
        is_ardupilot_process(process: psutil.Process) bool
    }
    class FirmwareManager {
        firmware_path(platform: Platform) Path
    }
    AutopilotManager --> FirmwareManager
    AutopilotManager : +is_ardupilot_process(process)
    FirmwareManager : +firmware_path(platform)

    %% Highlight the new exception handling
    class is_ardupilot_process {
        +try/except psutil.NoSuchProcess
    }
Loading

File-Level Changes

Change Details Files
Add exception handling around process.cmdline() to avoid a race condition when processes exit
  • Wrap the cmdline() call in a try/except block
  • Catch psutil.NoSuchProcess and silently ignore it to continue scanning
  • Preserve original string containment check logic
core/services/ardupilot_manager/autopilot_manager.py

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

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 @joaoantoniocardoso - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `core/services/ardupilot_manager/autopilot_manager.py:502` </location>
<code_context>
                 firmware_path = self.firmware_manager.firmware_path(platform)
-                if str(firmware_path) in " ".join(process.cmdline()):
-                    return True
+                try:
+                    if str(firmware_path) in " ".join(process.cmdline()):
+                        return True
+                except psutil.NoSuchProcess:
+                    # process may have died before we could call cmdline()
+                    pass
             return False

</code_context>

<issue_to_address>
Consider broadening exception handling to include AccessDenied and ZombieProcess.

psutil.cmdline() may also raise AccessDenied or ZombieProcess, so including these in the exception handling will improve reliability.

Suggested implementation:

```python
                try:
                    if str(firmware_path) in " ".join(process.cmdline()):
                        return True
                except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                    # process may have died, become a zombie, or access was denied before we could call cmdline()
                    pass

```

If `psutil.AccessDenied` and `psutil.ZombieProcess` are not already imported in this file, ensure that `import psutil` is present at the top of the file. If only specific exceptions are imported, add these two to the import statement.
</issue_to_address>

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.

Comment on lines +502 to +507
try:
if str(firmware_path) in " ".join(process.cmdline()):
return True
except psutil.NoSuchProcess:
# process may have died before we could call cmdline()
pass
Copy link

Choose a reason for hiding this comment

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

suggestion: Consider broadening exception handling to include AccessDenied and ZombieProcess.

psutil.cmdline() may also raise AccessDenied or ZombieProcess, so including these in the exception handling will improve reliability.

Suggested implementation:

                try:
                    if str(firmware_path) in " ".join(process.cmdline()):
                        return True
                except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                    # process may have died, become a zombie, or access was denied before we could call cmdline()
                    pass

If psutil.AccessDenied and psutil.ZombieProcess are not already imported in this file, ensure that import psutil is present at the top of the file. If only specific exceptions are imported, add these two to the import statement.

@patrickelectric patrickelectric merged commit 359de6e into bluerobotics:1.4 Aug 9, 2025
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants