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.

Sign up for GitHub

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

Jump to bottom

[rhcos-4.7] Backport patches for lsblk workaround and prjquota #905

Merged
merged 5 commits into from
Mar 22, 2021
Merged

[rhcos-4.7] Backport patches for lsblk workaround and prjquota #905

merged 5 commits into from
Mar 22, 2021

Commits on Mar 19, 2021

  1. overlay: don't restamp rootfs UUID if reprovisioning 

    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)
    @jlebon
    jlebon committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    0c24e50 View commit details
    Browse the repository at this point in the history

  2. overlay/growfs: handle broken lsblk in el8 

    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)
    @jlebon
    jlebon committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    63a26f9 View commit details
    Browse the repository at this point in the history

  3. tests/misc-ro: check for prjquota 

    By default, we mount XFS with the `prjquota` option. Verify this.

(cherry picked from commit b9dca27)
    @jlebon
    jlebon committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    e958249 View commit details
    Browse the repository at this point in the history

  4. tests/root-reprovision: use ok and fatal helpers 

    We should have those in a shared shell library.

(cherry picked from commit 1b11322)
    @jlebon
    jlebon committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    0f8f92f View commit details
    Browse the repository at this point in the history

  5. overlay: always use prjquota for XFS rootfs 

    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)
    @jlebon
    jlebon committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    63ffd70 View commit details
    Browse the repository at this point in the history