Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #4151

/assign joelcapitao

We adjust test to be compatible with both mpath friendly and
non-friendly names.
@openshift-ci
Copy link

openshift-ci bot commented Nov 4, 2025

Hi @openshift-cherrypick-robot. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@joelcapitao
Copy link
Member

/ok-to-test

Copy link
Contributor

@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 aims to make the multipath root test more robust by dynamically detecting the device name. The approach is good, but the new shell command has a bug in its use of findmnt that makes the test incorrect. I've also suggested further improvements to make the command more robust against cases with multiple or no multipath devices.

Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/bash -c '[[ $(findmnt -nvro SOURCE /sysroot) == /dev/mapper/mpatha4 ]]'
ExecStart=/bin/bash -c 'lsblk -pno NAME "/dev/mapper/$(multipath -l -v 1)" | grep -qw "$(findmnt -nvr /sysroot -o SOURCE)"'
Copy link
Contributor

Choose a reason for hiding this comment

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

high

This command has a few issues that make it incorrect or fragile:

  1. The -v flag to findmnt means --invert, which will cause it to list the sources for all mountpoints except /sysroot. This is not the intended behavior. The v should be removed.
  2. The $(multipath -l -v 1) is quoted. If multipath were to return multiple devices (one per line), command substitution would replace newlines with spaces, and lsblk would receive a single invalid path like "/dev/mapper/mpatha mpathb". While the current test setup only creates one multipath device, it's more robust to not quote this to allow for word splitting.
  3. If multipath -l -v 1 returns no devices, lsblk will be called on /dev/mapper/ which lists all devices under it. This could lead to false positives. It's better to check that multipath returns at least one device.

I'd also recommend using -v1 instead of -v 1 for multipath for better compatibility.

Here is a more robust version of the command that addresses these points:

Suggested change
ExecStart=/bin/bash -c 'lsblk -pno NAME "/dev/mapper/$(multipath -l -v 1)" | grep -qw "$(findmnt -nvr /sysroot -o SOURCE)"'
ExecStart=/bin/bash -c 'MPATH_DEVS=$(multipath -l -v1); [ -n "$MPATH_DEVS" ] && lsblk -pno NAME /dev/mapper/$MPATH_DEVS | grep -qw "$(findmnt -nr /sysroot -o SOURCE)"'

@joelcapitao
Copy link
Member

/override continuous-integration/jenkins/pr-merge

For some reason the worker pod is terminated consistently when cheking format with gofmt

@openshift-ci
Copy link

openshift-ci bot commented Nov 4, 2025

@joelcapitao: Overrode contexts on behalf of joelcapitao: continuous-integration/jenkins/pr-merge

In response to this:

/override continuous-integration/jenkins/pr-merge

For some reason the worker pod is terminated consistently when cheking format with gofmt

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.

@joelcapitao joelcapitao enabled auto-merge (rebase) November 4, 2025 17:12
Copy link
Contributor

@yasminvalim yasminvalim left a comment

Choose a reason for hiding this comment

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

/lgtm

@joelcapitao joelcapitao merged commit ecdc534 into coreos:rhcos-4.17 Nov 4, 2025
4 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants