Re: [pve-devel] [PATCH cluster] Workaround for broken corosync-qdevice SysV config

2019-07-09 Thread Thomas Lamprecht
On 7/9/19 5:31 PM, Stefan Reiter wrote:
> 
> The author of corosync-qdevice is aware of the issue:
> https://bugs.launchpad.net/ubuntu/+source/corosync-qdevice/+bug/1809682

FYI, those are not the authors of corosync-qdevice, those are some ubuntu
maintainers, AFAICT from the ubuntu-ha team. The qdevice main authors are
Jan Friesse and Christine Caulfield, but they do not provide native Debian
packaging support.

As we use the corosync-qdevice from Debian in PVE 6 based on Buster this is
not the correct upstream, albeit sometimes Ubuntu and Debian maintainers are
the same (or at least one of them), or they share much with upstream.

It may be worth to check how the Debian and Ubuntu HA team is woven together
and if it seems that they are not connected together it may be worth to still
report a (sensible) bug to Debian BTS, with a link to the Ubuntu Bug report
so that it's ensured the Debian HA Maintainer are informed and pointed to
this specific issue, in the worst case they can tell you that they work or
know already of it.

But it just seems that we may need to package this ourself anyway, no big
hassle but would've been still nice to avoid.

___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


[pve-devel] [PATCH cluster] Workaround for broken corosync-qdevice SysV config

2019-07-09 Thread Stefan Reiter
Since we use only systemd, we can simply remove this file. Without
removing, the "systemd enable" command fails, complaining about unset
run-levels.

Signed-off-by: Stefan Reiter 
---

The author of corosync-qdevice is aware of the issue:
https://bugs.launchpad.net/ubuntu/+source/corosync-qdevice/+bug/1809682

Until it is merged upstream, this patch allows creation and removal of qdevices
without issues.

 data/PVE/CLI/pvecm.pm | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/data/PVE/CLI/pvecm.pm b/data/PVE/CLI/pvecm.pm
index 823130a..de6b21a 100755
--- a/data/PVE/CLI/pvecm.pm
+++ b/data/PVE/CLI/pvecm.pm
@@ -243,6 +243,11 @@ __PACKAGE__->register_method ({
my $outsub = sub { print "\nnode '$node': " . shift };
print "\nINFO: start and enable corosync qdevice daemon on node 
'$node'...\n";
run_command([@$ssh_cmd, $ip, 'systemctl', 'start', 
'corosync-qdevice'], outfunc => \&$outsub);
+
+   # corosync-qdevice package ships with broken SysV file
+   # FIXME: Remove once fix is upstream
+   run_command([@$ssh_cmd, $ip, 'rm', '-f', 
'/etc/init.d/corosync-qdevice']);
+
run_command([@$ssh_cmd, $ip, 'systemctl', 'enable', 
'corosync-qdevice'], outfunc => \&$outsub);
});
 
@@ -300,6 +305,11 @@ __PACKAGE__->register_method ({
$foreach_member->(sub {
my (undef, $ip) = @_;
run_command([@$ssh_cmd, $ip, 'systemctl', 'stop', 
'corosync-qdevice']);
+
+   # corosync-qdevice package ships with broken SysV file
+   # FIXME: Remove once fix is upstream
+   run_command([@$ssh_cmd, $ip, 'rm', '-f', 
'/etc/init.d/corosync-qdevice']);
+
run_command([@$ssh_cmd, $ip, 'systemctl', 'disable', 
'corosync-qdevice']);
});
 
-- 
2.20.1


___
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel