From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH v5 storage 08/36] diskmanage: add helper to list multipath devices
Date: Mon, 16 Nov 2026 02:23:17 +0100 [thread overview]
Message-ID: <20261116012355.3187417-9-t.lamprecht@proxmox.com> (raw)
In-Reply-To: <20261116012355.3187417-1-t.lamprecht@proxmox.com>
From: Dietmar Maurer <dietmar@proxmox.com>
The disk enumeration leaves out multipath maps, as its callers manage
local disks. The SAN LUN inventory needs them, so add a separate
helper. It takes vendor, model and transport from a member path and
reuses the usage detection to tell unused LUNs from LVM physical
volumes and other uses.
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
[TL: take the maps and their members from PVE::Multipath instead of
reading sysfs here; never probe with pvs, which can block on a map;
drop redundant comments]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
src/PVE/Diskmanage.pm | 65 ++++++++++++++++-
src/test/disk_tests/multipath/disklist | 9 +++
.../multipath/disklist_expected.json | 72 +++++++++++++++++++
src/test/disk_tests/multipath/dm-0/dm/name | 1 +
src/test/disk_tests/multipath/dm-0/dm/uuid | 1 +
src/test/disk_tests/multipath/dm-0/size | 1 +
src/test/disk_tests/multipath/dm-0_slaves | 4 ++
src/test/disk_tests/multipath/dm-1/dm/name | 1 +
src/test/disk_tests/multipath/dm-1/dm/uuid | 1 +
src/test/disk_tests/multipath/dm-1/size | 1 +
src/test/disk_tests/multipath/dm-1_slaves | 4 ++
src/test/disk_tests/multipath/dm-2/dm/name | 1 +
src/test/disk_tests/multipath/dm-2/dm/uuid | 1 +
src/test/disk_tests/multipath/dm-2/size | 1 +
src/test/disk_tests/multipath/dm-2_slaves | 0
src/test/disk_tests/multipath/dm-3/dm/name | 1 +
src/test/disk_tests/multipath/dm-3/dm/uuid | 1 +
src/test/disk_tests/multipath/dm-3/size | 1 +
src/test/disk_tests/multipath/dm-3_slaves | 0
src/test/disk_tests/multipath/dm-4/dm/name | 1 +
src/test/disk_tests/multipath/dm-4/dm/uuid | 1 +
src/test/disk_tests/multipath/dm-4/size | 1 +
src/test/disk_tests/multipath/dm-4_slaves | 0
src/test/disk_tests/multipath/lsblk | 59 +++++++++++++++
src/test/disk_tests/multipath/lvs | 0
src/test/disk_tests/multipath/mounts | 1 +
.../multipath/multipath_expected.json | 59 +++++++++++++++
src/test/disk_tests/multipath/partlist | 0
src/test/disk_tests/multipath/pvs | 1 +
.../disk_tests/multipath/sda/device/model | 1 +
.../disk_tests/multipath/sda/device/vendor | 1 +
.../disk_tests/multipath/sda/holders/holder | 1 +
.../disk_tests/multipath/sda/queue/rotational | 1 +
src/test/disk_tests/multipath/sda/size | 1 +
src/test/disk_tests/multipath/sda_udevadm | 18 +++++
.../disk_tests/multipath/sdb/device/model | 1 +
.../disk_tests/multipath/sdb/device/vendor | 1 +
.../disk_tests/multipath/sdb/holders/holder | 1 +
.../disk_tests/multipath/sdb/queue/rotational | 1 +
src/test/disk_tests/multipath/sdb/size | 1 +
src/test/disk_tests/multipath/sdb_udevadm | 18 +++++
.../disk_tests/multipath/sdc/device/model | 1 +
.../disk_tests/multipath/sdc/device/vendor | 1 +
.../disk_tests/multipath/sdc/holders/holder | 1 +
.../disk_tests/multipath/sdc/queue/rotational | 1 +
src/test/disk_tests/multipath/sdc/size | 1 +
src/test/disk_tests/multipath/sdc_udevadm | 18 +++++
.../disk_tests/multipath/sdd/device/model | 1 +
.../disk_tests/multipath/sdd/device/vendor | 1 +
.../disk_tests/multipath/sdd/holders/holder | 1 +
.../disk_tests/multipath/sdd/queue/rotational | 1 +
src/test/disk_tests/multipath/sdd/size | 1 +
src/test/disk_tests/multipath/sdd_udevadm | 18 +++++
src/test/disk_tests/multipath/zpool | 1 +
src/test/disklist_test.pm | 48 ++++++++++++-
55 files changed, 428 insertions(+), 2 deletions(-)
create mode 100644 src/test/disk_tests/multipath/dm-0/dm/name
create mode 100644 src/test/disk_tests/multipath/dm-0/dm/uuid
create mode 100644 src/test/disk_tests/multipath/dm-0/size
create mode 100644 src/test/disk_tests/multipath/dm-0_slaves
create mode 100644 src/test/disk_tests/multipath/dm-1/dm/name
create mode 100644 src/test/disk_tests/multipath/dm-1/dm/uuid
create mode 100644 src/test/disk_tests/multipath/dm-1/size
create mode 100644 src/test/disk_tests/multipath/dm-1_slaves
create mode 100644 src/test/disk_tests/multipath/dm-2/dm/name
create mode 100644 src/test/disk_tests/multipath/dm-2/dm/uuid
create mode 100644 src/test/disk_tests/multipath/dm-2/size
create mode 100644 src/test/disk_tests/multipath/dm-2_slaves
create mode 100644 src/test/disk_tests/multipath/dm-3/dm/name
create mode 100644 src/test/disk_tests/multipath/dm-3/dm/uuid
create mode 100644 src/test/disk_tests/multipath/dm-3/size
create mode 100644 src/test/disk_tests/multipath/dm-3_slaves
create mode 100644 src/test/disk_tests/multipath/dm-4/dm/name
create mode 100644 src/test/disk_tests/multipath/dm-4/dm/uuid
create mode 100644 src/test/disk_tests/multipath/dm-4/size
create mode 100644 src/test/disk_tests/multipath/dm-4_slaves
create mode 100644 src/test/disk_tests/multipath/lvs
create mode 100644 src/test/disk_tests/multipath/mounts
create mode 100644 src/test/disk_tests/multipath/multipath_expected.json
create mode 100644 src/test/disk_tests/multipath/partlist
create mode 100644 src/test/disk_tests/multipath/pvs
create mode 100644 src/test/disk_tests/multipath/sda/device/model
create mode 100644 src/test/disk_tests/multipath/sda/device/vendor
create mode 100644 src/test/disk_tests/multipath/sda/holders/holder
create mode 100644 src/test/disk_tests/multipath/sda/queue/rotational
create mode 100644 src/test/disk_tests/multipath/sda/size
create mode 100644 src/test/disk_tests/multipath/sda_udevadm
create mode 100644 src/test/disk_tests/multipath/sdb/device/model
create mode 100644 src/test/disk_tests/multipath/sdb/device/vendor
create mode 100644 src/test/disk_tests/multipath/sdb/holders/holder
create mode 100644 src/test/disk_tests/multipath/sdb/queue/rotational
create mode 100644 src/test/disk_tests/multipath/sdb/size
create mode 100644 src/test/disk_tests/multipath/sdb_udevadm
create mode 100644 src/test/disk_tests/multipath/sdc/device/model
create mode 100644 src/test/disk_tests/multipath/sdc/device/vendor
create mode 100644 src/test/disk_tests/multipath/sdc/holders/holder
create mode 100644 src/test/disk_tests/multipath/sdc/queue/rotational
create mode 100644 src/test/disk_tests/multipath/sdc/size
create mode 100644 src/test/disk_tests/multipath/sdc_udevadm
create mode 100644 src/test/disk_tests/multipath/sdd/device/model
create mode 100644 src/test/disk_tests/multipath/sdd/device/vendor
create mode 100644 src/test/disk_tests/multipath/sdd/holders/holder
create mode 100644 src/test/disk_tests/multipath/sdd/queue/rotational
create mode 100644 src/test/disk_tests/multipath/sdd/size
create mode 100644 src/test/disk_tests/multipath/sdd_udevadm
create mode 100644 src/test/disk_tests/multipath/zpool
diff --git a/src/PVE/Diskmanage.pm b/src/PVE/Diskmanage.pm
index 516c108d..f1a5cd18 100644
--- a/src/PVE/Diskmanage.pm
+++ b/src/PVE/Diskmanage.pm
@@ -200,7 +200,7 @@ sub get_smart_data {
}
sub get_lsblk_info {
- my $cmd = [$LSBLK, '--json', '-o', 'path,parttype,fstype,tran'];
+ my $cmd = [$LSBLK, '--json', '-o', 'path,parttype,fstype,tran,pttype'];
my $output = "";
eval {
run_command($cmd, outfunc => sub { $output .= "$_[0]\n"; });
@@ -218,6 +218,7 @@ sub get_lsblk_info {
parttype => $_->{parttype},
fstype => $_->{fstype},
tran => $_->{tran},
+ pttype => $_->{pttype},
}
} @{$list}
};
@@ -818,6 +819,68 @@ sub get_disks {
return $disklist;
}
+# Keep multipath maps separate from get_disks(), whose callers manage local disks.
+sub get_multipath_disks {
+ my ($maps) = @_;
+ my $mounted = mounted_blockdevs();
+ my $lsblk_info = get_lsblk_info();
+ my $zfshash = get_zfs_devices($lsblk_info);
+ my $lvmhash = get_lvm_devices($lsblk_info, 1); # no pvs probe, it can block on a map
+
+ my $disklist = {};
+
+ for my $dev (sort keys %$maps) {
+ my $sysdir = "/sys/block/$dev";
+ my $map = $maps->{$dev};
+ my $wwid = $map->{wwid};
+ my $devpath = "/dev/mapper/$map->{name}";
+ my $resolved_devpath = abs_path($devpath);
+ my @devpaths = ($devpath);
+ push @devpaths, $resolved_devpath
+ if defined($resolved_devpath) && $resolved_devpath ne $devpath;
+
+ my $size = get_sysdir_size($sysdir) or next;
+ my $slaves = $map->{slaves};
+
+ my ($vendor, $model, $transport) = ('unknown', 'unknown', undef);
+ if (my $first = $slaves->[0]) {
+ if (my $sysdata = get_sysdir_info("/sys/block/$first")) {
+ $vendor = $sysdata->{vendor};
+ $model = $sysdata->{model};
+ }
+ $transport = $lsblk_info->{"/dev/$first"}->{tran};
+ }
+
+ my $used;
+ $used = 'LVM' if grep { $lvmhash->{$_} } @devpaths;
+ $used //= 'ZFS' if grep { $zfshash->{$_} } @devpaths;
+ my $info = {};
+ for my $path (@devpaths) {
+ $info = $lsblk_info->{$path} // next;
+ last;
+ }
+ $used //= "$info->{fstype}" if defined($info->{fstype});
+ $used //= 'mounted' if grep { $mounted->{$_} } @devpaths;
+ $used //= 'partitions'
+ if defined($info->{pttype}) && $info->{pttype} ne '';
+ $used //= 'Device Mapper' if !dir_is_empty("$sysdir/holders");
+
+ $disklist->{$dev} = {
+ devpath => $devpath,
+ size => $size,
+ vendor => $vendor,
+ model => $model,
+ wwn => $wwid,
+ paths => scalar($slaves->@*),
+ slaves => [map { "/dev/$_" } $slaves->@*],
+ };
+ $disklist->{$dev}->{transport} = $transport if defined($transport);
+ $disklist->{$dev}->{used} = $used if $used;
+ }
+
+ return $disklist;
+}
+
# Native multipath creates per-path namespace children nvmeXcYnZ below controllers. Local
# single-controller devices lack these children and are omitted.
sub get_nvme_path_status {
diff --git a/src/test/disk_tests/multipath/disklist b/src/test/disk_tests/multipath/disklist
index b5e636a5..f759ba9e 100644
--- a/src/test/disk_tests/multipath/disklist
+++ b/src/test/disk_tests/multipath/disklist
@@ -1,2 +1,11 @@
+sda
+sdb
+sdc
+sdd
+dm-0
+dm-1
+dm-2
+dm-3
+dm-4
nvme8n1
nvme9n1
diff --git a/src/test/disk_tests/multipath/disklist_expected.json b/src/test/disk_tests/multipath/disklist_expected.json
index 908c2b56..ec442969 100644
--- a/src/test/disk_tests/multipath/disklist_expected.json
+++ b/src/test/disk_tests/multipath/disklist_expected.json
@@ -1,4 +1,76 @@
{
+ "sda": {
+ "devpath": "/dev/sda",
+ "size": 10737418240,
+ "vendor": "SANVEND",
+ "model": "SANMODEL",
+ "serial": "SSERa",
+ "wwn": "0x600140500000000a",
+ "gpt": 0,
+ "rpm": -1,
+ "type": "unknown",
+ "health": "UNKNOWN",
+ "wearout": "N/A",
+ "osdid": -1,
+ "osdid-list": null,
+ "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000a",
+ "transport": "fc",
+ "used": "Device Mapper"
+ },
+ "sdb": {
+ "devpath": "/dev/sdb",
+ "size": 10737418240,
+ "vendor": "SANVEND",
+ "model": "SANMODEL",
+ "serial": "SSERb",
+ "wwn": "0x600140500000000b",
+ "gpt": 0,
+ "rpm": -1,
+ "type": "unknown",
+ "health": "UNKNOWN",
+ "wearout": "N/A",
+ "osdid": -1,
+ "osdid-list": null,
+ "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000b",
+ "transport": "fc",
+ "used": "Device Mapper"
+ },
+ "sdc": {
+ "devpath": "/dev/sdc",
+ "size": 10737418240,
+ "vendor": "SANVEND",
+ "model": "SANMODEL",
+ "serial": "SSERc",
+ "wwn": "0x600140500000000c",
+ "gpt": 0,
+ "rpm": -1,
+ "type": "unknown",
+ "health": "UNKNOWN",
+ "wearout": "N/A",
+ "osdid": -1,
+ "osdid-list": null,
+ "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000c",
+ "transport": "fc",
+ "used": "Device Mapper"
+ },
+ "sdd": {
+ "devpath": "/dev/sdd",
+ "size": 10737418240,
+ "vendor": "SANVEND",
+ "model": "SANMODEL",
+ "serial": "SSERd",
+ "wwn": "0x600140500000000d",
+ "gpt": 0,
+ "rpm": -1,
+ "type": "unknown",
+ "health": "UNKNOWN",
+ "wearout": "N/A",
+ "osdid": -1,
+ "osdid-list": null,
+ "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000d",
+ "transport": "fc",
+ "used": "Device Mapper"
+ },
"nvme8n1": {
"devpath": "/dev/nvme8n1",
"size": 10737418240,
diff --git a/src/test/disk_tests/multipath/dm-0/dm/name b/src/test/disk_tests/multipath/dm-0/dm/name
new file mode 100644
index 00000000..0ed057a0
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-0/dm/name
@@ -0,0 +1 @@
+mpatha
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/dm-0/dm/uuid b/src/test/disk_tests/multipath/dm-0/dm/uuid
new file mode 100644
index 00000000..094955aa
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-0/dm/uuid
@@ -0,0 +1 @@
+mpath-3600140500000000000000000000000001
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/dm-0/size b/src/test/disk_tests/multipath/dm-0/size
new file mode 100644
index 00000000..8280959b
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-0/size
@@ -0,0 +1 @@
+20971520
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/dm-0_slaves b/src/test/disk_tests/multipath/dm-0_slaves
new file mode 100644
index 00000000..16373159
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-0_slaves
@@ -0,0 +1,4 @@
+.
+..
+sda
+sdb
diff --git a/src/test/disk_tests/multipath/dm-1/dm/name b/src/test/disk_tests/multipath/dm-1/dm/name
new file mode 100644
index 00000000..f70ac3d8
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-1/dm/name
@@ -0,0 +1 @@
+mpathb
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/dm-1/dm/uuid b/src/test/disk_tests/multipath/dm-1/dm/uuid
new file mode 100644
index 00000000..7e8567b8
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-1/dm/uuid
@@ -0,0 +1 @@
+mpath-3600140500000000000000000000000002
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/dm-1/size b/src/test/disk_tests/multipath/dm-1/size
new file mode 100644
index 00000000..8280959b
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-1/size
@@ -0,0 +1 @@
+20971520
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/dm-1_slaves b/src/test/disk_tests/multipath/dm-1_slaves
new file mode 100644
index 00000000..cde08b36
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-1_slaves
@@ -0,0 +1,4 @@
+.
+..
+sdc
+sdd
diff --git a/src/test/disk_tests/multipath/dm-2/dm/name b/src/test/disk_tests/multipath/dm-2/dm/name
new file mode 100644
index 00000000..4770de43
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-2/dm/name
@@ -0,0 +1 @@
+mpathc
diff --git a/src/test/disk_tests/multipath/dm-2/dm/uuid b/src/test/disk_tests/multipath/dm-2/dm/uuid
new file mode 100644
index 00000000..2d607eae
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-2/dm/uuid
@@ -0,0 +1 @@
+mpath-3600140500000000000000000000000003
diff --git a/src/test/disk_tests/multipath/dm-2/size b/src/test/disk_tests/multipath/dm-2/size
new file mode 100644
index 00000000..14faeece
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-2/size
@@ -0,0 +1 @@
+20971520
diff --git a/src/test/disk_tests/multipath/dm-2_slaves b/src/test/disk_tests/multipath/dm-2_slaves
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/disk_tests/multipath/dm-3/dm/name b/src/test/disk_tests/multipath/dm-3/dm/name
new file mode 100644
index 00000000..a98ef69c
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-3/dm/name
@@ -0,0 +1 @@
+mpathd
diff --git a/src/test/disk_tests/multipath/dm-3/dm/uuid b/src/test/disk_tests/multipath/dm-3/dm/uuid
new file mode 100644
index 00000000..75f25b81
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-3/dm/uuid
@@ -0,0 +1 @@
+mpath-3600140500000000000000000000000004
diff --git a/src/test/disk_tests/multipath/dm-3/size b/src/test/disk_tests/multipath/dm-3/size
new file mode 100644
index 00000000..14faeece
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-3/size
@@ -0,0 +1 @@
+20971520
diff --git a/src/test/disk_tests/multipath/dm-3_slaves b/src/test/disk_tests/multipath/dm-3_slaves
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/disk_tests/multipath/dm-4/dm/name b/src/test/disk_tests/multipath/dm-4/dm/name
new file mode 100644
index 00000000..e084e8f6
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-4/dm/name
@@ -0,0 +1 @@
+mpathe
diff --git a/src/test/disk_tests/multipath/dm-4/dm/uuid b/src/test/disk_tests/multipath/dm-4/dm/uuid
new file mode 100644
index 00000000..0ca78754
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-4/dm/uuid
@@ -0,0 +1 @@
+mpath-3600140500000000000000000000000005
diff --git a/src/test/disk_tests/multipath/dm-4/size b/src/test/disk_tests/multipath/dm-4/size
new file mode 100644
index 00000000..14faeece
--- /dev/null
+++ b/src/test/disk_tests/multipath/dm-4/size
@@ -0,0 +1 @@
+20971520
diff --git a/src/test/disk_tests/multipath/dm-4_slaves b/src/test/disk_tests/multipath/dm-4_slaves
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/disk_tests/multipath/lsblk b/src/test/disk_tests/multipath/lsblk
index 597adf94..35cc1b8a 100644
--- a/src/test/disk_tests/multipath/lsblk
+++ b/src/test/disk_tests/multipath/lsblk
@@ -1,5 +1,64 @@
{
"blockdevices": [
+ {
+ "path": "/dev/sda",
+ "parttype": null,
+ "fstype": null,
+ "tran": "fc"
+ },
+ {
+ "path": "/dev/sdb",
+ "parttype": null,
+ "fstype": null,
+ "tran": "fc"
+ },
+ {
+ "path": "/dev/sdc",
+ "parttype": null,
+ "fstype": null,
+ "tran": "fc"
+ },
+ {
+ "path": "/dev/sdd",
+ "parttype": null,
+ "fstype": null,
+ "tran": "fc"
+ },
+ {
+ "path": "/dev/mapper/mpatha",
+ "parttype": null,
+ "fstype": null,
+ "tran": null,
+ "pttype": null
+ },
+ {
+ "path": "/dev/mapper/mpathb",
+ "parttype": null,
+ "fstype": "LVM2_member",
+ "tran": null,
+ "pttype": null
+ },
+ {
+ "path": "/dev/mapper/mpathc",
+ "parttype": null,
+ "fstype": null,
+ "tran": null,
+ "pttype": "gpt"
+ },
+ {
+ "path": "/dev/dm-3",
+ "parttype": null,
+ "fstype": null,
+ "tran": null,
+ "pttype": null
+ },
+ {
+ "path": "/dev/dm-4",
+ "parttype": null,
+ "fstype": null,
+ "tran": null,
+ "pttype": null
+ },
{
"path": "/dev/nvme8n1",
"parttype": null,
diff --git a/src/test/disk_tests/multipath/lvs b/src/test/disk_tests/multipath/lvs
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/disk_tests/multipath/mounts b/src/test/disk_tests/multipath/mounts
new file mode 100644
index 00000000..06ada278
--- /dev/null
+++ b/src/test/disk_tests/multipath/mounts
@@ -0,0 +1 @@
+/dev/mapper/mpathe /mnt
diff --git a/src/test/disk_tests/multipath/multipath_expected.json b/src/test/disk_tests/multipath/multipath_expected.json
new file mode 100644
index 00000000..bee629a1
--- /dev/null
+++ b/src/test/disk_tests/multipath/multipath_expected.json
@@ -0,0 +1,59 @@
+{
+ "dm-0": {
+ "devpath": "/dev/mapper/mpatha",
+ "size": 10737418240,
+ "vendor": "SANVEND",
+ "model": "SANMODEL",
+ "wwn": "3600140500000000000000000000000001",
+ "paths": 2,
+ "slaves": [
+ "/dev/sda",
+ "/dev/sdb"
+ ],
+ "transport": "fc"
+ },
+ "dm-1": {
+ "devpath": "/dev/mapper/mpathb",
+ "size": 10737418240,
+ "vendor": "SANVEND",
+ "model": "SANMODEL",
+ "wwn": "3600140500000000000000000000000002",
+ "paths": 2,
+ "slaves": [
+ "/dev/sdc",
+ "/dev/sdd"
+ ],
+ "transport": "fc",
+ "used": "LVM2_member"
+ },
+ "dm-2": {
+ "devpath": "/dev/mapper/mpathc",
+ "size": 10737418240,
+ "vendor": "unknown",
+ "model": "unknown",
+ "wwn": "3600140500000000000000000000000003",
+ "paths": 0,
+ "slaves": [],
+ "used": "partitions"
+ },
+ "dm-3": {
+ "devpath": "/dev/mapper/mpathd",
+ "size": 10737418240,
+ "vendor": "unknown",
+ "model": "unknown",
+ "wwn": "3600140500000000000000000000000004",
+ "paths": 0,
+ "slaves": [],
+ "used": "ZFS"
+ },
+ "dm-4": {
+ "devpath": "/dev/mapper/mpathe",
+ "size": 10737418240,
+ "vendor": "unknown",
+ "model": "unknown",
+ "wwn": "3600140500000000000000000000000005",
+ "paths": 0,
+ "slaves": [],
+ "used": "mounted"
+ }
+}
diff --git a/src/test/disk_tests/multipath/partlist b/src/test/disk_tests/multipath/partlist
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/disk_tests/multipath/pvs b/src/test/disk_tests/multipath/pvs
new file mode 100644
index 00000000..9c2f9b93
--- /dev/null
+++ b/src/test/disk_tests/multipath/pvs
@@ -0,0 +1 @@
+ /dev/dm-1
diff --git a/src/test/disk_tests/multipath/sda/device/model b/src/test/disk_tests/multipath/sda/device/model
new file mode 100644
index 00000000..2f50f3f3
--- /dev/null
+++ b/src/test/disk_tests/multipath/sda/device/model
@@ -0,0 +1 @@
+SANMODEL
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sda/device/vendor b/src/test/disk_tests/multipath/sda/device/vendor
new file mode 100644
index 00000000..ead8944c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sda/device/vendor
@@ -0,0 +1 @@
+SANVEND
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sda/holders/holder b/src/test/disk_tests/multipath/sda/holders/holder
new file mode 100644
index 00000000..9255a92c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sda/holders/holder
@@ -0,0 +1 @@
+dm-holder
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sda/queue/rotational b/src/test/disk_tests/multipath/sda/queue/rotational
new file mode 100644
index 00000000..56a6051c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sda/queue/rotational
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sda/size b/src/test/disk_tests/multipath/sda/size
new file mode 100644
index 00000000..8280959b
--- /dev/null
+++ b/src/test/disk_tests/multipath/sda/size
@@ -0,0 +1 @@
+20971520
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sda_udevadm b/src/test/disk_tests/multipath/sda_udevadm
new file mode 100644
index 00000000..7bd58b4e
--- /dev/null
+++ b/src/test/disk_tests/multipath/sda_udevadm
@@ -0,0 +1,18 @@
+P: /devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sda
+N: sda
+S: disk/by-id/scsi-36001405000000000000000000000000a
+E: DEVLINKS=/dev/disk/by-id/scsi-36001405000000000000000000000000a
+E: DEVNAME=/dev/sda
+E: DEVPATH=/devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sda
+E: DEVTYPE=disk
+E: ID_BUS=scsi
+E: ID_MODEL=SANMODEL
+E: ID_SCSI=1
+E: ID_SERIAL=SANSERIALa
+E: ID_SERIAL_SHORT=SSERa
+E: ID_TYPE=disk
+E: ID_VENDOR=SANVEND
+E: ID_WWN=0x600140500000000a
+E: MAJOR=8
+E: MINOR=0
+E: SUBSYSTEM=block
diff --git a/src/test/disk_tests/multipath/sdb/device/model b/src/test/disk_tests/multipath/sdb/device/model
new file mode 100644
index 00000000..2f50f3f3
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdb/device/model
@@ -0,0 +1 @@
+SANMODEL
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdb/device/vendor b/src/test/disk_tests/multipath/sdb/device/vendor
new file mode 100644
index 00000000..ead8944c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdb/device/vendor
@@ -0,0 +1 @@
+SANVEND
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdb/holders/holder b/src/test/disk_tests/multipath/sdb/holders/holder
new file mode 100644
index 00000000..9255a92c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdb/holders/holder
@@ -0,0 +1 @@
+dm-holder
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdb/queue/rotational b/src/test/disk_tests/multipath/sdb/queue/rotational
new file mode 100644
index 00000000..56a6051c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdb/queue/rotational
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdb/size b/src/test/disk_tests/multipath/sdb/size
new file mode 100644
index 00000000..8280959b
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdb/size
@@ -0,0 +1 @@
+20971520
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdb_udevadm b/src/test/disk_tests/multipath/sdb_udevadm
new file mode 100644
index 00000000..9a04c63f
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdb_udevadm
@@ -0,0 +1,18 @@
+P: /devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sdb
+N: sdb
+S: disk/by-id/scsi-36001405000000000000000000000000b
+E: DEVLINKS=/dev/disk/by-id/scsi-36001405000000000000000000000000b
+E: DEVNAME=/dev/sdb
+E: DEVPATH=/devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sdb
+E: DEVTYPE=disk
+E: ID_BUS=scsi
+E: ID_MODEL=SANMODEL
+E: ID_SCSI=1
+E: ID_SERIAL=SANSERIALb
+E: ID_SERIAL_SHORT=SSERb
+E: ID_TYPE=disk
+E: ID_VENDOR=SANVEND
+E: ID_WWN=0x600140500000000b
+E: MAJOR=8
+E: MINOR=0
+E: SUBSYSTEM=block
diff --git a/src/test/disk_tests/multipath/sdc/device/model b/src/test/disk_tests/multipath/sdc/device/model
new file mode 100644
index 00000000..2f50f3f3
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdc/device/model
@@ -0,0 +1 @@
+SANMODEL
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdc/device/vendor b/src/test/disk_tests/multipath/sdc/device/vendor
new file mode 100644
index 00000000..ead8944c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdc/device/vendor
@@ -0,0 +1 @@
+SANVEND
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdc/holders/holder b/src/test/disk_tests/multipath/sdc/holders/holder
new file mode 100644
index 00000000..9255a92c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdc/holders/holder
@@ -0,0 +1 @@
+dm-holder
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdc/queue/rotational b/src/test/disk_tests/multipath/sdc/queue/rotational
new file mode 100644
index 00000000..56a6051c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdc/queue/rotational
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdc/size b/src/test/disk_tests/multipath/sdc/size
new file mode 100644
index 00000000..8280959b
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdc/size
@@ -0,0 +1 @@
+20971520
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdc_udevadm b/src/test/disk_tests/multipath/sdc_udevadm
new file mode 100644
index 00000000..acff253e
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdc_udevadm
@@ -0,0 +1,18 @@
+P: /devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sdc
+N: sdc
+S: disk/by-id/scsi-36001405000000000000000000000000c
+E: DEVLINKS=/dev/disk/by-id/scsi-36001405000000000000000000000000c
+E: DEVNAME=/dev/sdc
+E: DEVPATH=/devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sdc
+E: DEVTYPE=disk
+E: ID_BUS=scsi
+E: ID_MODEL=SANMODEL
+E: ID_SCSI=1
+E: ID_SERIAL=SANSERIALc
+E: ID_SERIAL_SHORT=SSERc
+E: ID_TYPE=disk
+E: ID_VENDOR=SANVEND
+E: ID_WWN=0x600140500000000c
+E: MAJOR=8
+E: MINOR=0
+E: SUBSYSTEM=block
diff --git a/src/test/disk_tests/multipath/sdd/device/model b/src/test/disk_tests/multipath/sdd/device/model
new file mode 100644
index 00000000..2f50f3f3
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdd/device/model
@@ -0,0 +1 @@
+SANMODEL
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdd/device/vendor b/src/test/disk_tests/multipath/sdd/device/vendor
new file mode 100644
index 00000000..ead8944c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdd/device/vendor
@@ -0,0 +1 @@
+SANVEND
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdd/holders/holder b/src/test/disk_tests/multipath/sdd/holders/holder
new file mode 100644
index 00000000..9255a92c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdd/holders/holder
@@ -0,0 +1 @@
+dm-holder
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdd/queue/rotational b/src/test/disk_tests/multipath/sdd/queue/rotational
new file mode 100644
index 00000000..56a6051c
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdd/queue/rotational
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdd/size b/src/test/disk_tests/multipath/sdd/size
new file mode 100644
index 00000000..8280959b
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdd/size
@@ -0,0 +1 @@
+20971520
\ No newline at end of file
diff --git a/src/test/disk_tests/multipath/sdd_udevadm b/src/test/disk_tests/multipath/sdd_udevadm
new file mode 100644
index 00000000..813c5f1d
--- /dev/null
+++ b/src/test/disk_tests/multipath/sdd_udevadm
@@ -0,0 +1,18 @@
+P: /devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sdd
+N: sdd
+S: disk/by-id/scsi-36001405000000000000000000000000d
+E: DEVLINKS=/dev/disk/by-id/scsi-36001405000000000000000000000000d
+E: DEVNAME=/dev/sdd
+E: DEVPATH=/devices/pci0000:00/0000:00:03.0/0000:02:00.0/host4/rport-4:0-0/target4:0:0/4:0:0:0/block/sdd
+E: DEVTYPE=disk
+E: ID_BUS=scsi
+E: ID_MODEL=SANMODEL
+E: ID_SCSI=1
+E: ID_SERIAL=SANSERIALd
+E: ID_SERIAL_SHORT=SSERd
+E: ID_TYPE=disk
+E: ID_VENDOR=SANVEND
+E: ID_WWN=0x600140500000000d
+E: MAJOR=8
+E: MINOR=0
+E: SUBSYSTEM=block
diff --git a/src/test/disk_tests/multipath/zpool b/src/test/disk_tests/multipath/zpool
new file mode 100644
index 00000000..e723f7e3
--- /dev/null
+++ b/src/test/disk_tests/multipath/zpool
@@ -0,0 +1 @@
+ /dev/dm-3 -
diff --git a/src/test/disklist_test.pm b/src/test/disklist_test.pm
index 0d34c0db..caa60e79 100644
--- a/src/test/disklist_test.pm
+++ b/src/test/disklist_test.pm
@@ -6,6 +6,7 @@ use warnings;
use lib qw(..);
use PVE::Diskmanage;
+use PVE::Multipath;
use PVE::Tools;
use Test::MockModule;
@@ -16,8 +17,17 @@ use Data::Dumper;
my $testcasedir; # current case directory
my $testcount = 0; # testcount for TAP::Harness
my $diskmanage_module; # mockmodule for PVE::Diskmanage
+my $multipath_module; # mockmodule for PVE::Multipath
my $print = 0;
+my $multipath_aliases = {
+ '/dev/mapper/mpatha' => '/dev/dm-0',
+ '/dev/mapper/mpathb' => '/dev/dm-1',
+ '/dev/mapper/mpathc' => '/dev/dm-2',
+ '/dev/mapper/mpathd' => '/dev/dm-3',
+ '/dev/mapper/mpathe' => '/dev/dm-4',
+};
+
sub mocked_run_command {
my ($cmd, %param) = @_;
@@ -122,6 +132,8 @@ sub mocked_dir_glob_foreach {
# read lines in from file
if ($dir =~ m{^/sys/block$}) {
@$lines = split(/\n/, read_test_file('disklist'));
+ } elsif ($dir =~ m{^/sys/block/([^/]+)/slaves$}) {
+ @$lines = split(/\n/, read_test_file("${1}_slaves"));
} elsif ($dir =~ m{^/sys/block/([^/]+)}) {
@$lines = split(/\n/, read_test_file('partlist'));
}
@@ -227,6 +239,21 @@ sub test_disk_list {
$testcount++;
is_deeply($disks, $expected_disk_list, 'disk list should be the same');
+ if (-f "disk_tests/$testcasedir/multipath_expected.json") {
+ my $multipath = PVE::Diskmanage::get_multipath_disks(PVE::Multipath::map_info());
+ my $expected_multipath = decode_json(read_test_file('multipath_expected.json'));
+
+ print Dumper($multipath) if $print;
+ $testcount++;
+ is_deeply($multipath, $expected_multipath, 'multipath list should be the same');
+
+ eval { PVE::Diskmanage::assert_disk_unused('/dev/dm-0'); };
+ $testcount++;
+ like($@, qr/not a valid local disk/,
+ 'multipath devices require an explicit opt-in');
+
+ }
+
if ($testcasedir eq 'iscsi') {
eval { PVE::Diskmanage::assert_disk_unused('/dev/sda'); };
$testcount++;
@@ -268,10 +295,20 @@ $diskmanage_module->mock('get_sysdir_size' => \&mocked_get_sysdir_size);
print("\tMocked get_sysdir_size\n");
$diskmanage_module->mock('assert_blockdev' => sub { return 1; });
print("\tMocked assert_blockdev\n");
+$multipath_module = Test::MockModule->new('PVE::Multipath', no_auto => 1);
+$multipath_module->mock('dir_glob_foreach' => \&mocked_dir_glob_foreach);
+$multipath_module->mock('file_read_firstline' => \&mocked_file_read_firstline);
$diskmanage_module->mock(
'dir_is_empty' => sub {
- # all partitions have a holder dir
my $val = shift;
+ # let test cases provide the dir (e.g. holders) with content
+ my $mapped = $val;
+ $mapped =~ s|^/sys/block|disk_tests/$testcasedir|;
+ if (-d $mapped) {
+ my $originalsub = $diskmanage_module->original('dir_is_empty');
+ return &$originalsub($mapped);
+ }
+ # all partitions have a holder dir
if ($val =~ m|^/sys/block/.+/.+/|) {
return 0;
}
@@ -281,6 +318,15 @@ $diskmanage_module->mock(
print("\tMocked dir_is_empty\n");
$diskmanage_module->mock('file_read_firstline' => \&mocked_file_read_firstline);
print("\tMocked file_read_firstline\n");
+$diskmanage_module->mock(
+ 'abs_path' => sub {
+ my ($path) = @_;
+ return $multipath_aliases->{$path}
+ if defined($multipath_aliases->{$path});
+ return &{ $diskmanage_module->original('abs_path') }($path);
+ },
+);
+print("\tMocked abs_path\n");
$diskmanage_module->mock('check_bin' => sub { return 1; });
print("\tMocked check_bin\n");
# the test cases name iSCSI LUNs through the lsblk transport, the sysfs of the host must not count
next prev parent reply other threads:[~2026-11-16 1:28 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 1:23 [PATCH v5 cluster,storage,docs,manager 00/36] SAN: cluster-wide multipath, SAN views and a guided setup for shared LVM Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 cluster 01/36] cfs: observe the multipath configuration files Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 02/36] diskmanage: collect disk transport type from lsblk Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 03/36] diskmanage: qualify NVMe over fabrics transport Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 04/36] diskmanage: optionally include iSCSI session devices in disk enumeration Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 05/36] diskmanage: collect native NVMe multipath path state Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 06/36] iscsi: factor out session device map from device list Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 07/36] multipath: add a library around multipathd Thomas Lamprecht
2026-11-16 1:23 ` Thomas Lamprecht [this message]
2026-11-16 1:23 ` [PATCH v5 storage 09/36] multipath: add a cluster-wide configuration Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 10/36] iscsi: add an option to manage storage LUNs with multipath Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 11/36] lvm: activate a missing base volume before using the volume group Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 12/36] multipath: apply the configuration on every node Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 13/36] multipath: publish per-node status Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 14/36] api: add endpoints for the cluster-wide multipath configuration Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 15/36] api: multipath: add the cluster-wide health status Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 16/36] api: scan: add a SAN LUN inventory Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 17/36] pvesm: expose the " Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 18/36] api: add node-level iSCSI status Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 19/36] disks: lvm: drop unused imports Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 20/36] disks: lvm: allow volume groups on SAN LUNs and multipath maps Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 21/36] disks: lvm: refuse to destroy the volume group of a shared storage Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 storage 22/36] disks: allow wiping a SAN LUN that no storage uses Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 docs 23/36] storage: document the cluster-wide multipath management Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 24/36] pvestatd: apply the multipath configuration and report the node status Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 25/36] report: add the managed multipath configuration Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 26/36] api: cluster: add the multipath endpoints Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 27/36] api: nodes: expose the iSCSI status Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 28/36] ui: dc: add a SAN view Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 29/36] ui: storage: iscsi: add the multipath option Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 30/36] ui: lvm: enable shared when a base storage is selected Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 31/36] ui: node: add SAN LUNs panel Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 32/36] ui: node: san: wipe a LUN that no storage uses Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 33/36] ui: node: san: show iSCSI targets and sessions Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 34/36] ui: dc: san: add a guided setup for shared LVM on iSCSI Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 35/36] ui: dc: san: add a guided setup for shared LVM on Fibre Channel Thomas Lamprecht
2026-11-16 1:23 ` [PATCH v5 manager 36/36] ui: storage: point the iSCSI and LVM add dialogs to the SAN view Thomas Lamprecht
2026-11-18 8:11 ` superseded: [PATCH v5 cluster,storage,docs,manager 00/36] SAN: cluster-wide multipath, SAN views and a guided setup for shared LVM Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116012355.3187417-9-t.lamprecht@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.