Skip to content

mantle/kola/tests: adapt mpath verification #4113

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

mantle/kola/tests: adapt mpath verification #4113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e952f26
mantle/kola/tests: adapt mpath verification
jcapiitao May 26, 2025
5290a96
mantle/kola/tests: use WWID in multipath.partition
jcapiitao May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions mantle/kola/tests/misc/multipath.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ systemd:

[Service]
Type=oneshot
ExecStart=/usr/sbin/mpathconf --enable
ExecStart=/usr/sbin/mpathconf --enable --user_friendly_names n

[Install]
WantedBy=multi-user.target
Expand All @@ -61,8 +61,8 @@ systemd:
[Unit]
Description=Set Up Multipath On /var/lib/containers
ConditionFirstBoot=true
Requires=dev-mapper-mpatha.device
After=dev-mapper-mpatha.device
Requires=dev-disk-by\x2did-dm\x2duuid\x2dmpath\x2d0x0000000000000001.device
After=dev-disk-by\x2did-dm\x2duuid\x2dmpath\x2d0x0000000000000001.device
# See https://github.com/coreos/coreos-assembler/pull/2457
# and https://github.com/openshift/os/issues/743
After=ostree-remount.service
Expand All @@ -71,7 +71,7 @@ systemd:

[Service]
Type=oneshot
ExecStart=/usr/sbin/mkfs.xfs -L containers -m reflink=1 /dev/mapper/mpatha
ExecStart=/usr/sbin/mkfs.xfs -L containers -m reflink=1 /dev/disk/by-id/dm-uuid-mpath-0x0000000000000001
# This is usually created by tmpfiles.d, but we run earlier than that.
ExecStart=/usr/bin/mkdir -p /var/lib/containers

Expand Down Expand Up @@ -119,7 +119,7 @@ func init() {
ClusterSize: 1,
Platforms: []string{"qemu"},
UserData: mpath_on_var_lib_containers,
AdditionalDisks: []string{"1G:mpath"},
AdditionalDisks: []string{"1G:mpath,wwn=1"},
})
}

Expand Down Expand Up @@ -151,7 +151,8 @@ func verifyBootDropins(c cluster.TestCluster, m platform.Machine, checkBootuuid

func verifyMultipath(c cluster.TestCluster, m platform.Machine, path string) {
srcdev := string(c.MustSSHf(m, "findmnt -nvr %s -o SOURCE", path))
if !strings.HasPrefix(srcdev, "/dev/mapper/mpath") {
udevinfo := string(c.MustSSHf(m, "udevadm info %s", srcdev))
if !strings.Contains(udevinfo, "/dev/disk/by-id/dm-uuid-mpath-") && !strings.Contains(udevinfo, "DM_MPATH") {
c.Fatalf("mount %s has non-multipath source %s", path, srcdev)
}
}
Expand Down
Loading