[rhcos-4.7] Backport patches for lsblk workaround and prjquota #905
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since we've created a new filesystem anyway. This implicitly also works around the service racing against the `by-label/root` symlink not being up to date after reprovisioning (which `ignition-ostree-transposefs-restore.service` now intercepts and fixes). (cherry picked from commit 195ae1f)
Sometimes `lsblk` returns devices in the wrong order, so we can't rely on it to iterate over the devices in hierarchical order. Instead, use the `holders/` directory ourselves directly and use `--nodeps` when calling `lsblk`. See: https://bugzilla.redhat.com/show_bug.cgi?id=1934174#c4 See: https://bugzilla.redhat.com/show_bug.cgi?id=1940607 See: coreos/coreos-installer#453 (cherry picked from commit 5228316)
By default, we mount XFS with the `prjquota` option. Verify this. (cherry picked from commit b9dca27)
We should have those in a shared shell library. (cherry picked from commit 1b11322)
By default, we use `prjquota` for the rootfs for container orchestrators to monitor and set drive space limits. However, with the added support for rootfs reprovisioning, we made this conditional on the rootfs not being reprovisioned, with the assumption that you can just set whatever options you'd like instead. Though actually doing that is really awkward right now, and it requires surfacing prjquota in user documentations (see https://bugzilla.redhat.com/show_bug.cgi?id=1940704#c2). Since AFAICT `prjquota` doesn't actually have any significant overhead, let's just simplify the messaging to: we *always* enable prjquota on XFS root filesystems. Users who want to override this can fallback to `rpm-ostree kargs` (and eventually once we have coreos#805, to `mountOptions: []`). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1940704 (cherry picked from commit a57a999)
miabbott
approved these changes
Mar 19, 2021
|
CI here likely will fail unfortunately because it's building with latest cosa instead of the 4.7 branch. |
cgwalters
approved these changes
Mar 19, 2021
Will do a local test with |
Looks good locally. Ran /lgtm |
|
/override continuous-integration/jenkins/pr-merge |
Oops, forgot that we don't use Prow for merging here |
c4rt0
pushed a commit
to c4rt0/fedora-coreos-config
that referenced
this pull request
Mar 27, 2023
ci: Enable more kola tests for SCOS
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I.e. #900 (for https://bugzilla.redhat.com/show_bug.cgi?id=1934863) and #903 (for https://bugzilla.redhat.com/show_bug.cgi?id=1940966).