From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id D27531FF0AF for ; Fri, 06 Nov 2026 01:51:21 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id B50D4216EB; Fri, 06 Nov 2026 01:50:57 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Subject: [PATCH v3 storage 17/76] diskmanage: link multipath member disks to their map device Date: Fri, 6 Nov 2026 00:30:52 +0100 Message-ID: <20261105233336.2178064-18-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261105233336.2178064-1-t.lamprecht@proxmox.com> References: <20261105233336.2178064-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793926178387 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.334 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: QZKU6JOA445PHIEJGP4AFMGBB5O4HUVF X-Message-ID-Hash: QZKU6JOA445PHIEJGP4AFMGBB5O4HUVF X-MailFrom: t.lamprecht@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Dietmar Maurer The generic 'Device Mapper' usage neither identifies a multipath map nor links its member paths. Report the map's device path in the multipath property so clients can group members or hide them in favor of the map. Signed-off-by: Dietmar Maurer [TL: drop redundant comments; clarify the multipath member description] Signed-off-by: Thomas Lamprecht --- src/PVE/API2/Disks.pm | 7 +++++ src/PVE/Diskmanage.pm | 31 +++++++++++++++++++ .../multipath/disklist_expected.json | 12 ++++--- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/Disks.pm b/src/PVE/API2/Disks.pm index fe383319..dd3524b5 100644 --- a/src/PVE/API2/Disks.pm +++ b/src/PVE/API2/Disks.pm @@ -150,6 +150,13 @@ __PACKAGE__->register_method({ . " 'iscsi', 'nvme', 'nvme-fc', or 'nvme-tcp'.", optional => 1, }, + multipath => { + type => 'string', + description => + 'The device path of the multipath map this device belongs to.' + . ' Only set for multipath member devices.', + optional => 1, + }, parent => { type => 'string', description => 'For partitions only. The device path of ' diff --git a/src/PVE/Diskmanage.pm b/src/PVE/Diskmanage.pm index be7d9828..807ef0ca 100644 --- a/src/PVE/Diskmanage.pm +++ b/src/PVE/Diskmanage.pm @@ -574,12 +574,40 @@ sub mounted_paths { return $mounted; } +my sub get_multipath_slave_map { + my $slave_map = {}; + + dir_glob_foreach( + '/sys/block', + 'dm-\d+', + sub { + my ($dev) = @_; + my $sysdir = "/sys/block/$dev"; + + my $uuid = file_read_firstline("$sysdir/dm/uuid") // return; + return if $uuid !~ m/^mpath-/; + + my $name = file_read_firstline("$sysdir/dm/name") // return; + + dir_glob_foreach( + "$sysdir/slaves", + '[^.].*', + sub { $slave_map->{ $_[0] } = "/dev/mapper/$name"; }, + ); + }, + ); + + return $slave_map; +} + sub get_disks { my ($disks, $nosmart, $include_partitions) = @_; my $disklist = {}; my $mounted = mounted_blockdevs(); + my $mpath_slave_map = get_multipath_slave_map(); + my $lsblk_info = get_lsblk_info(); my $journalhash = get_ceph_journals($lsblk_info); @@ -697,6 +725,9 @@ sub get_disks { $disklist->{$dev}->{transport} = $transport if defined($transport); $disklist->{$dev}->{mounted} = 1 if exists $mounted->{$devpath}; + my $mpath = $mpath_slave_map->{$dev}; + $disklist->{$dev}->{multipath} = $mpath if defined($mpath); + my $by_id_link = $data->{by_id_link}; $disklist->{$dev}->{by_id_link} = $by_id_link if defined($by_id_link); diff --git a/src/test/disk_tests/multipath/disklist_expected.json b/src/test/disk_tests/multipath/disklist_expected.json index ec442969..001193da 100644 --- a/src/test/disk_tests/multipath/disklist_expected.json +++ b/src/test/disk_tests/multipath/disklist_expected.json @@ -15,7 +15,8 @@ "osdid-list": null, "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000a", "transport": "fc", - "used": "Device Mapper" + "used": "Device Mapper", + "multipath": "/dev/mapper/mpatha" }, "sdb": { "devpath": "/dev/sdb", @@ -33,7 +34,8 @@ "osdid-list": null, "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000b", "transport": "fc", - "used": "Device Mapper" + "used": "Device Mapper", + "multipath": "/dev/mapper/mpatha" }, "sdc": { "devpath": "/dev/sdc", @@ -51,7 +53,8 @@ "osdid-list": null, "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000c", "transport": "fc", - "used": "Device Mapper" + "used": "Device Mapper", + "multipath": "/dev/mapper/mpathb" }, "sdd": { "devpath": "/dev/sdd", @@ -69,7 +72,8 @@ "osdid-list": null, "by_id_link": "/dev/disk/by-id/scsi-36001405000000000000000000000000d", "transport": "fc", - "used": "Device Mapper" + "used": "Device Mapper", + "multipath": "/dev/mapper/mpathb" }, "nvme8n1": { "devpath": "/dev/nvme8n1", -- 2.47.3