tools/hotplug: allow tuning of xenwatchdogd arguments
PATCH 1/1 tools/hotplug: allow tuning of xenwatchdogd arguments
Currently the arguments for xenwatchdogd are hardcoded with 15s keep-alive interval and 30s timeout.
It is not possible to tweak these values via /etc/systemd/system/xen-watchdog.service.d/*.conf because ExecStart can not be replaced. The only option would be a private copy /etc/systemd/system/xen-watchdog.service, which may get out of sync with the Xen provided xen-watchdog.service.
Adjust the service file to recognize XENWATCHDOGD_ARGS= in a private unit configuration file.
--- tools/hotplug/Linux/init.d/xen-watchdog.in | 7 ++++++- tools/hotplug/Linux/systemd/xen-watchdog.service.in | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-)
tools/hotplug/Linux/init.d/xen-watchdog.in +6 -1
@@ -19,6 +19,11 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh +xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +test -z "$XENWATCHDOGD_ARGS" || XENWATCHDOGD_ARGS='15 30' DAEMON=${sbindir}/xenwatchdogd base=$(basename $DAEMON)
@@ -46,7 +51,7 @@ start() { local r echo -n $"Starting domain watchdog daemon: " - $DAEMON 30 15 + $DAEMON $XENWATCHDOGD_ARGS r=$? [ "$r" -eq 0 ] && success $"$base startup" || failure $"$base startup" echo
tools/hotplug/Linux/systemd/xen-watchdog.service.in +3 -1
@@ -6,7 +6,9 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=forking -ExecStart=@sbindir@/xenwatchdogd 30 15 +Environment="XENWATCHDOGD_ARGS=30 15" +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons +ExecStart=@sbindir@/xenwatchdogd $XENWATCHDOGD_ARGS KillSignal=USR1 [Install]
Quoted 24 lines · Olaf Hering
Currently the arguments for xenwatchdogd are hardcoded with 15s keep-alive interval and 30s timeout.
It is not possible to tweak these values via
/etc/systemd/system/xen-watchdog.service.d/*.confbecause ExecStart can not be replaced. The only option would be a private copy/etc/systemd/system/xen-watchdog.service, which may get out of sync with the Xen provided xen-watchdog.service.Adjust the service file to recognize XENWATCHDOGD_ARGS= in a private unit configuration file.
Signed-off-by Olaf Hering <[email protected]>--- tools/hotplug/Linux/init.d/xen-watchdog.in | 7 ++++++- tools/hotplug/Linux/systemd/xen-watchdog.service.in | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-)tools/hotplug/Linux/init.d/xen-watchdog.in +0
-0
tools/hotplug/Linux/init.d/xen-watchdog.in line 26
Quoted 8 lines
tools/hotplug/Linux/init.d/xen-watchdog.in +5
-0@@ -19,6 +19,11 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh +xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ + +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons + +test -z "$XENWATCHDOGD_ARGS" || XENWATCHDOGD_ARGS='15 30'
This should be test -z ... && or test -n ... || to set the default values properly.
Regards,
Jason