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 53F2E1FF0B7 for ; Fri, 13 Nov 2026 04:03:38 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 7FBE0217C1; Fri, 13 Nov 2026 04:02:05 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Subject: [PATCH v4 storage 04/36] diskmanage: optionally include iSCSI session devices in disk enumeration Date: Fri, 13 Nov 2026 04:00:22 +0100 Message-ID: <20261113030146.1559030-5-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113030146.1559030-1-t.lamprecht@proxmox.com> References: <20261113030146.1559030-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: 1794538913661 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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) POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far 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: FB5ABJX4KYFHPSSV3EGO274NIBAXWVAL X-Message-ID-Hash: FB5ABJX4KYFHPSSV3EGO274NIBAXWVAL 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 disk enumeration skips iSCSI session devices, as its callers manage local disks. The SAN LUN inventory needs them, so let a caller ask for them. Such a listing also skips the usage probes that read from the devices (pvs, ceph-volume), as they can block on a LUN whose paths are down. Callers that do not ask get the same list as before, so local disk operations keep refusing iSCSI LUNs. Signed-off-by: Dietmar Maurer [TL: include the devices only on request instead of always, and skip the usage probes that read from devices then] Signed-off-by: Thomas Lamprecht --- src/PVE/Diskmanage.pm | 33 +++++++++---------- src/test/disk_tests/iscsi/disklist | 1 + .../disk_tests/iscsi/disklist_expected.json | 19 +++++++++++ src/test/disk_tests/iscsi/lsblk | 5 +++ src/test/disk_tests/iscsi/sda/device/model | 1 + src/test/disk_tests/iscsi/sda/device/vendor | 1 + .../disk_tests/iscsi/sda/queue/rotational | 1 + src/test/disk_tests/iscsi/sda/size | 1 + src/test/disk_tests/iscsi/sda_udevadm | 21 ++++++++++++ src/test/disklist_test.pm | 20 +++++++---- 10 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 src/test/disk_tests/iscsi/disklist create mode 100644 src/test/disk_tests/iscsi/disklist_expected.json create mode 100644 src/test/disk_tests/iscsi/lsblk create mode 100644 src/test/disk_tests/iscsi/sda/device/model create mode 100644 src/test/disk_tests/iscsi/sda/device/vendor create mode 100644 src/test/disk_tests/iscsi/sda/queue/rotational create mode 100644 src/test/disk_tests/iscsi/sda/size create mode 100644 src/test/disk_tests/iscsi/sda_udevadm diff --git a/src/PVE/Diskmanage.pm b/src/PVE/Diskmanage.pm index 7862bcd4..5043a83d 100644 --- a/src/PVE/Diskmanage.pm +++ b/src/PVE/Diskmanage.pm @@ -92,6 +92,13 @@ sub parse_wipefs_signatures { return $probe->{signatures}; } +sub is_iscsi_device { + my ($dev) = @_; + + my $link = readlink("/sys/block/$dev"); + return defined($link) && $link =~ m{/session\d+/} ? 1 : 0; +} + sub disk_is_used { my ($disk) = @_; @@ -263,7 +270,7 @@ sub get_zfs_devices { } sub get_lvm_devices { - my ($lsblk_info) = @_; + my ($lsblk_info, $no_probe) = @_; my $res = {}; eval { run_command( @@ -275,7 +282,7 @@ sub get_lvm_devices { $res->{$line} = 1; } }, - ); + ) if !$no_probe; }; # if something goes wrong, we do not want to give up, but indicate an error has occurred @@ -495,16 +502,6 @@ sub dir_is_empty { return 1; } -sub is_iscsi { - my ($sysdir) = @_; - - if (-l $sysdir && readlink($sysdir) =~ m|host[^/]*/session[^/]*|) { - return 1; - } - - return 0; -} - # Returns the NVMe transport (pcie, fc, tcp, rdma, loop) of a namespace, either directly from # its controller, or from any controller of its subsystem for native NVMe multipath setups. sub get_nvme_transport { @@ -557,7 +554,8 @@ sub mounted_paths { } sub get_disks { - my ($disks, $nosmart, $include_partitions) = @_; + my ($disks, $nosmart, $include_partitions, $san_inventory) = @_; + # SAN inventory includes iSCSI session devices and skips usage probes that read devices. my $disklist = {}; my $mounted = mounted_blockdevs(); @@ -565,11 +563,11 @@ sub get_disks { my $lsblk_info = get_lsblk_info(); my $journalhash = get_ceph_journals($lsblk_info); - my $ceph_volume_infos = get_ceph_volume_infos(); + my $ceph_volume_infos = $san_inventory ? {} : get_ceph_volume_infos(); my $zfshash = get_zfs_devices($lsblk_info); - my $lvmhash = get_lvm_devices($lsblk_info); + my $lvmhash = get_lvm_devices($lsblk_info, $san_inventory); my $disk_regex = ".*"; if (defined($disks)) { @@ -609,14 +607,13 @@ sub get_disks { && $dev !~ m/^nvme\d+n\d+$/ && $dev !~ m/^cciss\!c\d+d\d+$/; + return if !$san_inventory && is_iscsi_device($dev); + my $data = get_udev_info("/sys/block/$dev") // return; my $devpath = $data->{devpath}; my $sysdir = "/sys/block/$dev"; - # we do not want iscsi devices - return if is_iscsi($sysdir); - my $nvme_transport; $nvme_transport = get_nvme_transport($sysdir) if $dev =~ m/^nvme/; diff --git a/src/test/disk_tests/iscsi/disklist b/src/test/disk_tests/iscsi/disklist new file mode 100644 index 00000000..9191c61b --- /dev/null +++ b/src/test/disk_tests/iscsi/disklist @@ -0,0 +1 @@ +sda diff --git a/src/test/disk_tests/iscsi/disklist_expected.json b/src/test/disk_tests/iscsi/disklist_expected.json new file mode 100644 index 00000000..ca334106 --- /dev/null +++ b/src/test/disk_tests/iscsi/disklist_expected.json @@ -0,0 +1,19 @@ +{ + "sda": { + "devpath": "/dev/sda", + "size": 10737418240, + "vendor": "LIO-ORG", + "model": "vdisk1", + "serial": "ISER1", + "wwn": "0x60014051111111111", + "gpt": 0, + "rpm": -1, + "type": "unknown", + "health": "UNKNOWN", + "wearout": "N/A", + "osdid": -1, + "osdid-list": null, + "by_id_link": "/dev/disk/by-id/scsi-360014051111111111", + "transport": "iscsi" + } +} diff --git a/src/test/disk_tests/iscsi/lsblk b/src/test/disk_tests/iscsi/lsblk new file mode 100644 index 00000000..526d27c5 --- /dev/null +++ b/src/test/disk_tests/iscsi/lsblk @@ -0,0 +1,5 @@ +{ + "blockdevices": [ + {"path":"/dev/sda", "parttype":null, "fstype":null, "tran":"iscsi"} + ] +} diff --git a/src/test/disk_tests/iscsi/sda/device/model b/src/test/disk_tests/iscsi/sda/device/model new file mode 100644 index 00000000..b14d6fe7 --- /dev/null +++ b/src/test/disk_tests/iscsi/sda/device/model @@ -0,0 +1 @@ +vdisk1 diff --git a/src/test/disk_tests/iscsi/sda/device/vendor b/src/test/disk_tests/iscsi/sda/device/vendor new file mode 100644 index 00000000..968831cd --- /dev/null +++ b/src/test/disk_tests/iscsi/sda/device/vendor @@ -0,0 +1 @@ +LIO-ORG diff --git a/src/test/disk_tests/iscsi/sda/queue/rotational b/src/test/disk_tests/iscsi/sda/queue/rotational new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/src/test/disk_tests/iscsi/sda/queue/rotational @@ -0,0 +1 @@ +1 diff --git a/src/test/disk_tests/iscsi/sda/size b/src/test/disk_tests/iscsi/sda/size new file mode 100644 index 00000000..14faeece --- /dev/null +++ b/src/test/disk_tests/iscsi/sda/size @@ -0,0 +1 @@ +20971520 diff --git a/src/test/disk_tests/iscsi/sda_udevadm b/src/test/disk_tests/iscsi/sda_udevadm new file mode 100644 index 00000000..ca9f7815 --- /dev/null +++ b/src/test/disk_tests/iscsi/sda_udevadm @@ -0,0 +1,21 @@ +P: /devices/platform/host5/session1/target5:0:0/5:0:0:0/block/sda +N: sda +S: disk/by-id/scsi-360014051111111111 +S: disk/by-id/wwn-0x60014051111111111 +S: disk/by-path/ip-192.168.1.10:3260-iscsi-iqn.2003-01.org.linux-iscsi.storage:target1-lun-0 +E: DEVLINKS=/dev/disk/by-id/scsi-360014051111111111 /dev/disk/by-id/wwn-0x60014051111111111 /dev/disk/by-path/ip-192.168.1.10:3260-iscsi-iqn.2003-01.org.linux-iscsi.storage:target1-lun-0 +E: DEVNAME=/dev/sda +E: DEVPATH=/devices/platform/host5/session1/target5:0:0/5:0:0:0/block/sda +E: DEVTYPE=disk +E: ID_BUS=scsi +E: ID_MODEL=vdisk1 +E: ID_PATH=ip-192.168.1.10:3260-iscsi-iqn.2003-01.org.linux-iscsi.storage:target1-lun-0 +E: ID_SCSI=1 +E: ID_SERIAL=36001405111111111 +E: ID_SERIAL_SHORT=ISER1 +E: ID_TYPE=disk +E: ID_VENDOR=LIO-ORG +E: ID_WWN=0x60014051111111111 +E: MAJOR=8 +E: MINOR=0 +E: SUBSYSTEM=block diff --git a/src/test/disklist_test.pm b/src/test/disklist_test.pm index 51b20c53..bd70dc33 100644 --- a/src/test/disklist_test.pm +++ b/src/test/disklist_test.pm @@ -97,10 +97,6 @@ sub mocked_get_sysdir_size { return &$originalsub($param); } -sub mocked_is_iscsi { - return 0; -} - sub mocked_file_read_firstline { my ($path) = @_; @@ -173,6 +169,7 @@ sub test_disk_list { eval { $disks = PVE::Diskmanage::get_disks(); }; warn $@ if $@; $expected_disk_list = decode_json(read_test_file('disklist_expected.json')); + $expected_disk_list = {} if $testcasedir eq 'iscsi'; print Dumper($disks) if $print; $testcount++; @@ -223,6 +220,16 @@ sub test_disk_list { $testcount++; is_deeply($disks, $expected_disk_list, 'disk list should be the same'); + if ($testcasedir eq 'iscsi') { + eval { PVE::Diskmanage::assert_disk_unused('/dev/sda'); }; + $testcount++; + like($@, qr/not a valid local disk/, 'local disk operations reject an iSCSI LUN'); + + my $san_disks = PVE::Diskmanage::get_disks(undef, 1, 0, 1); + $testcount++; + ok($san_disks->{sda}, 'SAN inventory opts into iSCSI'); + } + done_testing($testcount); }; } @@ -243,8 +250,6 @@ $diskmanage_module->mock('get_sysdir_info' => \&mocked_get_sysdir_info); print("\tMocked get_sysdir_info\n"); $diskmanage_module->mock('get_sysdir_size' => \&mocked_get_sysdir_size); print("\tMocked get_sysdir_size\n"); -$diskmanage_module->mock('is_iscsi' => \&mocked_is_iscsi); -print("\tMocked is_iscsi\n"); $diskmanage_module->mock('assert_blockdev' => sub { return 1; }); print("\tMocked assert_blockdev\n"); $diskmanage_module->mock( @@ -262,6 +267,9 @@ $diskmanage_module->mock('file_read_firstline' => \&mocked_file_read_firstline); print("\tMocked file_read_firstline\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 +$diskmanage_module->mock('is_iscsi_device' => sub { return $testcasedir eq 'iscsi'; }); +print("\tMocked is_iscsi_device\n"); my $tools_module = Test::MockModule->new('PVE::ProcFSTools', no_auto => 1); $tools_module->mock('parse_proc_mounts' => \&mocked_parse_proc_mounts); print("\tMocked parse_proc_mounts\n");