Skip to content

Conversation

vojtechtrefny
Copy link
Member

@vojtechtrefny vojtechtrefny commented Aug 28, 2025

This also fixes issue where failed temporary mount was silently ignored (because util.mount doesn't raise an exception) and the operation that requires the btrfs device to be mounted then failed with a hard to decipher error message.

Related: rhbz#2379800

Summary by Sourcery

Use libblockdev for performing temporary btrfs mount and unmount operations to ensure mount failures are handled explicitly and unmount errors are logged appropriately.

Bug Fixes:

  • Raise a descriptive BTRFSError when a temporary btrfs mount fails instead of silently ignoring it

Enhancements:

  • Switch to using libblockdev.fs.mount and unmount for temporary btrfs mounts
  • Log errors when unmounting a temporarily mounted btrfs device fails and still clean up the mount directory

This also fixes issue where failed temporary mount was silently
ignored (because `util.mount` doesn't raise an exception) and the
operation that requires the btrfs device to be mounted then failed
with a hard to decipher error message.

Related: rhbz#2379800
Copy link

sourcery-ai bot commented Aug 28, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Switch temporary btrfs mount/unmount operations to use libblockdev’s APIs and improve error handling by raising a specific BTRFSError on mount failure and logging unmount failures before cleanup.

Class diagram for updated error handling in btrfs temporary mount

classDiagram
    class BtrfsDevice {
        _do_temp_mount(orig=False)
    }
    class blockdev {
        fs.mount(device, mountpoint, fstype, mountopts)
        fs.unmount(mountpoint)
        FSError
    }
    class errors {
        BTRFSError
    }
    BtrfsDevice --|> errors : raises BTRFSError
    BtrfsDevice --> blockdev : uses fs.mount, fs.unmount
    blockdev --|> errors : FSError used as cause
Loading

File-Level Changes

Change Details Files
Use libblockdev.fs.mount for temporary mounts with explicit BTRFSError on failure
  • Replaced util.mount call with blockdev.fs.mount
  • Changed exception to catch blockdev.FSError
  • Replaced silent mount failure with raising errors.BTRFSError containing device info
blivet/devices/btrfs.py
Use libblockdev.fs.unmount for cleanup with error logging
  • Replaced util.umount call with blockdev.fs.unmount
  • Wrapped unmount in try/except to log failures
  • Only remove temporary directory after successful unmount
blivet/devices/btrfs.py

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


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.

@vojtechtrefny vojtechtrefny merged commit 326c434 into storaged-project:main Aug 28, 2025
14 of 15 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.

1 participant