Skip to content

improve /ffi/memory cleanup#971

Merged
Yarboa merged 1 commit intocontainers:mainfrom
pengshanyu:fix-ffi-memory
Mar 26, 2026
Merged

improve /ffi/memory cleanup#971
Yarboa merged 1 commit intocontainers:mainfrom
pengshanyu:fix-ffi-memory

Conversation

@pengshanyu
Copy link
Copy Markdown
Collaborator

@pengshanyu pengshanyu commented Mar 24, 2026

The changes include:

  • Added remove ffi-asil after test;
  • Improved disk_cleanup()

Resolve: #970

Summary by Sourcery

Tighten FFI test cleanup to more safely remove large temporary files and ensure memory is freed after memory tests.

Bug Fixes:

  • Avoid attempting to delete empty file lists during disk cleanup in FFI tests.
  • Remove interactive flags from container cleanup to make podman commands non-interactive in automated tests.

Enhancements:

  • Introduce a dedicated memory_disk_cleanup trap in the FFI memory test to remove the ffi-asil container and then run standard disk cleanup.

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Mar 24, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Refines FFI memory test cleanup by safely removing large temporary files only when found, simplifying podman exec usage, and ensuring the ffi-asil container is explicitly removed on test exit before running the common disk cleanup routine.

File-Level Changes

Change Details Files
Harden disk cleanup logic to avoid unsafe rm invocations and unnecessary interactive podman exec flags.
  • Guard removal of large files under /var/qm by checking that the find command returned a non-empty result before calling rm -rf
  • Remove the -it flags from the podman exec invocation used to clean up containers inside the qm container
  • Guard removal of large files under /root by checking that the find command returned a non-empty result before calling rm -f
tests/ffi/common/prepare.sh
Extend memory test teardown to explicitly remove the ffi-asil container before running shared disk cleanup.
  • Introduce a memory_disk_cleanup helper that force-removes the ffi-asil container while ignoring errors, then calls the shared disk_cleanup function
  • Update the EXIT trap to invoke memory_disk_cleanup instead of disk_cleanup directly
tests/ffi/memory/test.sh

Assessment against linked issues

Issue Objective Addressed Explanation
#970 Fix the flaky failure of /tests/ffi/memory during the disk_cleanup step, in particular the OCI runtime error from podman exec -it qm /usr/bin/podman rm -af.
#970 Make disk_cleanup more robust by safely handling cases where no large files are found for deletion in /var/qm and /root.

Possibly linked issues

  • improve /tests/ffi/memory #970: PR directly updates disk_cleanup and podman exec usage in /tests/ffi/memory, targeting the intermittent cleanup failure described.

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

@gemini-code-assist
Copy link
Copy Markdown

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the test suite's cleanup mechanisms, particularly for FFI memory tests. It introduces a dedicated function to ensure the ffi-asil container is properly removed post-test, and fortifies the general disk cleanup routine by making file removal conditional on the existence of files to be deleted. These changes aim to improve test reliability and resource management.

Highlights

  • Test Cleanup: A new cleanup step was added to remove the ffi-asil container after tests, specifically for memory-related tests.
  • Disk Cleanup Robustness: The disk_cleanup function was improved to prevent rm commands from failing when no files matching the criteria are found, by checking if the find command returns any results before attempting deletion.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

@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 - I've left some high level feedback:

  • In disk_cleanup, consider using find ... -delete (e.g., find /var/qm -size +2G -delete) instead of capturing paths into a variable and passing them to rm to avoid word-splitting issues and potential argument list overflows.
  • For consistency with the rest of the script and to preserve unified logging/error handling, you might want to run podman rm -f ffi-asil through exec_cmd inside memory_disk_cleanup instead of calling podman directly.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In `disk_cleanup`, consider using `find ... -delete` (e.g., `find /var/qm -size +2G -delete`) instead of capturing paths into a variable and passing them to `rm` to avoid word-splitting issues and potential argument list overflows.
- For consistency with the rest of the script and to preserve unified logging/error handling, you might want to run `podman rm -f ffi-asil` through `exec_cmd` inside `memory_disk_cleanup` instead of calling `podman` directly.

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.

Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request significantly improves the cleanup procedures for FFI tests. The changes enhance robustness by preventing rm commands from being executed with empty file lists, which could lead to errors or unexpected behavior. Additionally, interactive flags have been removed from podman exec commands, making them more suitable for automated test environments. A dedicated cleanup trap has also been introduced for memory tests, ensuring specific containers are removed to free resources effectively.

Comment thread tests/ffi/common/prepare.sh
Comment thread tests/ffi/common/prepare.sh
Comment thread tests/ffi/common/prepare.sh
Comment thread tests/ffi/memory/test.sh Outdated
@pengshanyu
Copy link
Copy Markdown
Collaborator Author

Hi @dougsland , @Yarboa , could you help to review this PR, thanks.

Comment thread tests/ffi/memory/test.sh Outdated

trap disk_cleanup EXIT
# Remove ffi-asil to free host RAM, then do disk_cleanup
memory_disk_cleanup() {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Consider moving this to prepare and call it with ARGs
Could be used for other tests
memory_cleanup container_name=ffi-asil disk_cleanup

Copy link
Copy Markdown
Collaborator Author

@pengshanyu pengshanyu Mar 26, 2026

Choose a reason for hiding this comment

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

Hi @Yarboa , it's a good suggestion, thank you.
Done.

Signed-off-by: pengshanyu <yupengshan@hotmail.com>
Copy link
Copy Markdown
Collaborator

@Yarboa Yarboa left a comment

Choose a reason for hiding this comment

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

LGTM

@Yarboa Yarboa merged commit 9762247 into containers:main Mar 26, 2026
25 checks passed
@pengshanyu pengshanyu deleted the fix-ffi-memory branch March 27, 2026 06:11
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.

improve /tests/ffi/memory

2 participants