From 78638b3deaac57fa17e4e92588ee85bba53c9834 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 28 Apr 2022 18:17:56 +0200 Subject: [PATCH] rbd: get path: allow fake override of fsid in scfg for some regression tests to avoid calls into RADOS connect, that trigger RPCEnv not initialized breakage in regression tests, but wouldn't really work otherwise either in the future the RBD $scfg could actually support this (or similarly named) property, to safe on storage addition and then avoid frequent mon commands Signed-off-by: Thomas Lamprecht --- PVE/Storage/RBDPlugin.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index d71af36..91a4a76 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -45,7 +45,10 @@ my sub get_rbd_dev_path { my ($scfg, $storeid, $volume) = @_; my $cluster_id = ''; - if ($scfg->{monhost}) { + if ($scfg->{fsid}) { + # NOTE: the config doesn't support this currently (but it could!), hack for qemu-server tests + $cluster_id = $scfg->{fsid}; + } elsif ($scfg->{monhost}) { my $rados = $librados_connect->($scfg, $storeid); $cluster_id = $rados->mon_command({ prefix => 'fsid', format => 'json' })->{fsid}; } else { -- 2.39.2