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

[v5.4-rhel] Create quota before _data dir for volumes #25488

Merged
merged 1 commit into from
Mar 10, 2025

Conversation

mheon
Copy link
Member

@mheon mheon commented Mar 5, 2025

Backport of #25417 minus the c/storage update to v5.4-rhel branch.

Fixes https://issues.redhat.com/browse/RHEL-82198
Fixes https://issues.redhat.com/browse/RHEL-82199

Does this PR introduce a user-facing change?

NONE

@openshift-ci openshift-ci bot added release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 5, 2025
@mheon mheon changed the title Create quota before _data dir for volumes [v5.4-rhel] Create quota before _data dir for volumes Mar 5, 2025
@mheon
Copy link
Member Author

mheon commented Mar 5, 2025

@TomSweeneyRedHat PTAL

This resolves an ordering issue that prevented quotas from being
applied. XFS quotas are applied recursively, but only for
subdirectories created after the quota is applied; if we create
`_data` before the quota, and then use `_data` for all data in
the volume, the quota will never be used by the volume.

Also, add a test that volume quotas are working as designed using
an XFS formatted loop device in the system tests. This should
prevent any further regressions on basic quota functionality,
such as quotas being shared between volumes.

Fixes containers#25368
Fixes https://issues.redhat.com/browse/RHEL-82198
Fixes https://issues.redhat.com/browse/RHEL-82199

Signed-off-by: Matt Heon <[email protected]>
@mheon mheon force-pushed the backport_25368_fix branch from 6a9ed71 to a28e9fa Compare March 5, 2025 19:19
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM, but I like to have ack from @TomSweeneyRedHat

Also I suppose we should backport this in the regular 5.4 branch as well for next release.

@mheon
Copy link
Member Author

mheon commented Mar 6, 2025

/cherry-pick v5.4

From here, not the original, so we don't get the storage bump

@openshift-cherrypick-robot
Copy link
Collaborator

@mheon: once the present PR merges, I will cherry-pick it on top of v5.4 in a new PR and assign it to you.

In response to this:

/cherry-pick v5.4

From here, not the original, so we don't get the storage bump

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@mheon
Copy link
Member Author

mheon commented Mar 7, 2025

I'm just going to go ahead and merge given this is a cherry-pick.
/lgtm

Copy link
Contributor

openshift-ci bot commented Mar 7, 2025

@mheon: you cannot LGTM your own PR.

In response to this:

I'm just going to go ahead and merge given this is a cherry-pick.
/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@mheon
Copy link
Member Author

mheon commented Mar 7, 2025

Damn, I didn't use the cherry-pick bot for this, so I can't cheat the merge. Hah.
@baude @TomSweeneyRedHat Mind dropping an LGTM?

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM

@lsm5
Copy link
Member

lsm5 commented Mar 10, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 10, 2025
Copy link
Contributor

openshift-ci bot commented Mar 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, lsm5, mheon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit e48006b into containers:v5.4-rhel Mar 10, 2025
28 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@mheon: new pull request created: #25515

In response to this:

/cherry-pick v5.4

From here, not the original, so we don't get the storage bump

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants