As reported by a storage plugin developer in our community [0], some plugins might not throw an exception in the exact format we expect.
Since we only execute `zfs` subcommands (except for `zpool list`) [1] over SSH if `$method` is not a "LUN command" [2], the command executed on the remote is always `zfs destroy -r [...]`. Therefore, match against "dataset is busy" / "dataset does not exist" directly. Tested this with an LIO iSCSI provider set up in a Debian Trixie VM, as well as with the "legacy" proxmox-truenas plugin of the community [3] (the one that patches our existing sources), by migrating a VM's disk back and forth between the two ZFS-over-iSCSI storages, and also to others and back again. [0]: https://lore.proxmox.com/pve-devel/mailman.271.1758597756.390.pve-de...@lists.proxmox.com/ [1]: https://git.proxmox.com/?p=pve-storage.git;a=blob;f=src/PVE/Storage/ZFSPlugin.pm;h=99d8c8f43a27ae911ffd09c3aa9f25f1a8857015;hb=refs/heads/master#l84 [2]: https://git.proxmox.com/?p=pve-storage.git;a=blob;f=src/PVE/Storage/ZFSPlugin.pm;h=99d8c8f43a27ae911ffd09c3aa9f25f1a8857015;hb=refs/heads/master#l22 [3]: https://github.com/boomshankerx/proxmox-truenas Fixes: #6845 Signed-off-by: Max R. Carrara <m.carr...@proxmox.com> --- NOTE: If there are any other iSCSI providers I should test this with, I don't mind at all--it just takes a while to set everything up. src/PVE/Storage/ZFSPoolPlugin.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm index d8d8d0f..3b3456b 100644 --- a/src/PVE/Storage/ZFSPoolPlugin.pm +++ b/src/PVE/Storage/ZFSPoolPlugin.pm @@ -368,9 +368,9 @@ sub zfs_delete_zvol { eval { $class->zfs_request($scfg, undef, 'destroy', '-r', "$scfg->{pool}/$zvol"); }; if ($err = $@) { - if ($err =~ m/^zfs error:(.*): dataset is busy.*/) { + if ($err =~ m/dataset is busy/) { sleep(1); - } elsif ($err =~ m/^zfs error:.*: dataset does not exist.*$/) { + } elsif ($err =~ m/dataset does not exist/) { $err = undef; last; } else { -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
