[pve-devel] [PATCH pve-manager master v1] fix #6747: ceph: osd: swap vg and lv arguments when creating an OSD

[Max R. Carrara]

... specifically when creating logical volumes for OSD DB / WAL devices,
if the block device wasn't in use beforehand.

The original line was part of a fix for #6652 (92bbc0c89fe) and
slipped through during testing.

Fixes: #6747
Fixes: 92bbc0c89fe
Signed-off-by: Max R. Carrara <m.carrara at proxmox.com>
---

NOTE: Made sure that nothing slipped through this time around, both via
the UI and via the CLI.

Disks in my test VM:

# lsblk /dev/sd{d,e,f}
NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS
sdd    8:48   0  32G  0 disk
sde    8:64   0   4G  0 disk
sdf    8:80   0   4G  0 disk

Created the following OSDs via the CLI:

# pveceph osd create /dev/sdd
# pveceph osd create /dev/sdd --db_dev /dev/sde --wal_dev /dev/sdf
# pveceph osd create /dev/sdd --db_dev /dev/sde
# pveceph osd create /dev/sdd --wal_dev /dev/sde

... and ran the following in between:
# ceph osd down
# ceph osd stop
# pveceph osd destroy --cleanup=1

Necessary if creating and destroying a lot of OSDs with the same ID:
# systemctl reset-failed

This should (hopefully) cover everything.

 PVE/API2/Ceph/OSD.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm
index 0f850415..a952c952 100644
--- a/PVE/API2/Ceph/OSD.pm
+++ b/PVE/API2/Ceph/OSD.pm
@@ -466,7 +466,7 @@ __PACKAGE__->register_method({
                 my $lv = $type . "-" . UUID::uuid();
 
                 PVE::Storage::LVMPlugin::lvm_create_volume_group($dev->{devpath}, $vg);
-                $osd_lvcreate->($lv, $vg, $size);
+                $osd_lvcreate->($vg, $lv, $size);
 
                 if (PVE::Diskmanage::is_partition($dev->{devpath})) {
                     eval { PVE::Diskmanage::change_parttype($dev->{devpath}, '8E00'); };
-- 
2.47.2