yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd plugin: factor out helper to check if volume already exists

Browse Source 
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner
2024-12-19 11:43:07 +01:00
committed by Fabian Grünbichler
parent 9adc4c69ef
commit 3bf2193b44
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/PVE/Storage/RBDPlugin.pm
View File

@ -348,6 +348,16 @@ sub rbd_volume_du {
die "got no matching image from rbd du\n"; die "got no matching image from rbd du\n";
} }
my sub rbd_volume_exists {
my ($scfg, $storeid, $volname) = @_;
eval {
my $cmd = $rbd_cmd->($scfg, $storeid, 'info', $volname);
run_rbd_command($cmd, errmsg => "exist check", quiet => 1);
};
return $@ ? undef : 1;
}
# Configuration # Configuration
sub type { sub type {
@ -869,11 +879,8 @@ sub rename_volume {
$target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format) $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format)
if !$target_volname; if !$target_volname;
eval { die "target volume '${target_volname}' already exists\n"
my $cmd = $rbd_cmd->($scfg, $storeid, 'info', $target_volname); if rbd_volume_exists($scfg, $storeid, $target_volname);
run_rbd_command($cmd, errmsg => "exist check", quiet => 1);
};
die "target volume '${target_volname}' already exists\n" if !$@;
my $cmd = $rbd_cmd->($scfg, $storeid, 'rename', $source_image, $target_volname); my $cmd = $rbd_cmd->($scfg, $storeid, 'rename', $source_image, $target_volname);