Skip to content
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

[1.48.0] fix BZ 2232308 and bump version #1692

Merged
merged 3 commits into from
Aug 21, 2023

Conversation

vrothberg
Copy link
Member

No description provided.

@vrothberg vrothberg changed the base branch from main to release-1.48 August 21, 2023 07:55
Apply the naive diff only when it's not ID's parent.
This fixes a performance issue in rootful podman-system-df also
surfacing in Podman Desktop.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2232308
Signed-off-by: Valentin Rothberg <[email protected]>
* Fix a performance issue when calculating diff size in overlay
  (https://bugzilla.redhat.com/show_bug.cgi?id=2232308).

Signed-off-by: Valentin Rothberg <[email protected]>
Signed-off-by: Valentin Rothberg <[email protected]>
@vrothberg
Copy link
Member Author

@TomSweeneyRedHat @giuseppe PTAL

@vrothberg
Copy link
Member Author

@rhatdan PTAL

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan
Copy link
Member

rhatdan commented Aug 21, 2023

LGTM

@rhatdan rhatdan merged commit 3236f91 into containers:release-1.48 Aug 21, 2023
@TomSweeneyRedHat
Copy link
Member

I'm late, but LGTM. Thanks!

@vrothberg vrothberg deleted the bz-2232308 branch August 22, 2023 07:23
@nalind
Copy link
Member

nalind commented Aug 22, 2023

This change to DiffSize() is different from what did #1688 did to main. Which one is correct?

@vrothberg
Copy link
Member Author

Both are. For main there is another PR #1691 but CI is farting.

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.

5 participants