From c002dde70329b5553b79f3f1ad6d60771f4179c0 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 29 Jun 2011 15:55:15 -0700 Subject: [PATCH] xenserver: Restart HA daemon after force-reload-kmod. Otherwise its heartbeats start failing after the reload and the XenServer reboots after a minute or so. Thanks to Justin Pettit for figuring out that this was HA-related. Bug #5706. Reported-by: Henrik Amren --- xenserver/etc_init.d_openvswitch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index 81039004..534b81d1 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -81,6 +81,18 @@ start () { touch /var/lock/subsys/openvswitch } +force_reload_kmod () { + start force-reload-kmod + + # Restart the high-availability daemon if it is running. Otherwise + # it loses its heartbeat and reboots the system after a few minutes. + if pidof xhad >/dev/null && test -e /etc/xensource/xhad.conf; then + PATH=$PATH:/opt/xensource/xha + action "Stopping HA daemon" ha_stop_daemon + action "Starting HA daemon" ha_start_daemon + fi +} + stop () { $ovs_ctl stop stop_daemon ovs-xapi-sync @@ -114,7 +126,7 @@ case $1 in $ovs_ctl version ;; force-reload-kmod) - start force-reload-kmod + force_reload_kmod ;; help) printf "openvswitch [start|stop|restart|reload|force-reload|status|version]\n" -- 2.30.2