[PATCH manager 1/2] ceph: osd: stop triggering udev

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

As per the FIXME note, this was a workaround for #18525 which was fixed
in [#18904] and packaged in all versions since 249.1. We remove the
workaround for the createosd and destroyosd endpoints.

[#18904] https://github.com/systemd/systemd/pull/18904

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 PVE/API2/Ceph/OSD.pm | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm
index dce519a5..a0768dc0 100644
--- a/PVE/API2/Ceph/OSD.pm
+++ b/PVE/API2/Ceph/OSD.pm
@@ -418,9 +418,6 @@ __PACKAGE__->register_method({
             file_set_contents($ceph_bootstrap_osd_keyring, $bindata);
         }
 
-        # See FIXME below
-        my @udev_trigger_devs = ();
-
         # $size is in kibibytes
         my $osd_lvcreate = sub {
             my ($vg, $lv, $size) = @_;
@@ -471,8 +468,6 @@ __PACKAGE__->register_method({
                     warn $@ if $@;
                 }
 
-                push @udev_trigger_devs, $dev->{devpath};
-
                 return "$vg/$lv";
 
             } elsif ($dev->{used} eq 'LVM') {
@@ -514,7 +509,6 @@ __PACKAGE__->register_method({
                     warn $@ if $@;
                 }
 
-                push @udev_trigger_devs, $part;
                 return $part;
             }
 
@@ -540,8 +534,6 @@ __PACKAGE__->register_method({
                 my $devpath = $disklist->{$devname}->{devpath};
                 print "create OSD on $devpath (bluestore)\n";
 
-                push @udev_trigger_devs, $devpath;
-
                 my $osd_size = $disklist->{$devname}->{size};
                 my $size_map = {
                     db => int($osd_size / 10), # 10% of OSD
@@ -587,12 +579,6 @@ __PACKAGE__->register_method({
                 }
 
                 run_command($cmd);
-
-                # FIXME: Remove once we depend on systemd >= v249.
-                # Work around udev bug https://github.com/systemd/systemd/issues/18525 to ensure the
-                # udev database is updated.
-                eval { run_command(['udevadm', 'trigger', @udev_trigger_devs]); };
-                warn $@ if $@;
             });
         };
 
@@ -1043,9 +1029,6 @@ __PACKAGE__->register_method({
             # try to unmount from standard mount point
             my $mountpoint = "/var/lib/ceph/osd/ceph-$osdid";
 
-            # See FIXME below
-            my $udev_trigger_devs = {};
-
             my $remove_partition = sub {
                 my ($part) = @_;
 
@@ -1053,8 +1036,6 @@ __PACKAGE__->register_method({
                 my $partnum = PVE::Diskmanage::get_partnum($part);
                 my $devpath = PVE::Diskmanage::get_blockdev($part);
 
-                $udev_trigger_devs->{$devpath} = 1;
-
                 PVE::Diskmanage::wipe_blockdev($part);
                 print "remove partition $part (disk '${devpath}', partnum $partnum)\n";
                 eval { run_command(['/sbin/sgdisk', '-d', $partnum, "${devpath}"]); };
@@ -1078,8 +1059,6 @@ __PACKAGE__->register_method({
                                 run_command(['/sbin/pvremove', $dev], errfunc => sub { });
                             };
                             warn $@ if $@;
-
-                            $udev_trigger_devs->{$dev} = 1;
                         }
                     }
                 }
@@ -1118,14 +1097,6 @@ __PACKAGE__->register_method({
                     }
                 }
             }
-
-            # FIXME: Remove once we depend on systemd >= v249.
-            # Work around udev bug https://github.com/systemd/systemd/issues/18525 to ensure the
-            # udev database is updated.
-            if ($cleanup) {
-                eval { run_command(['udevadm', 'trigger', keys $udev_trigger_devs->%*]); };
-                warn $@ if $@;
-            }
         };
 
         return $rpcenv->fork_worker('cephdestroyosd', $osdsection, $authuser, $worker);
-- 
2.47.3