File 0001-Test-cts-ComponentFail-killed-corosync-doesn-t-respa.patch of Package pacemaker.26926
From cb3d55a9a055c0d68df76905ac75d6592d3ad9d6 Mon Sep 17 00:00:00 2001
From: Aleksei Burlakov <alekse.burlakov@suse.com>
Date: Thu, 10 Oct 2019 16:31:46 +0200
Subject: [PATCH] Test: cts: ComponentFail: killed corosync doesn't respawn
immediatelly.
corosync doesn't respawn immediatelly when killed, so that the
fencing had more time to reboot the node.
---
cts/Makefile.am | 3 ++-
cts/cts-support.in | 18 ++++++++++++++++++
cts/cts.conf | 3 +++
3 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 cts/cts.conf
Index: pacemaker-2.0.1+20190417.13d370ca9/cts/Makefile.am
===================================================================
--- pacemaker-2.0.1+20190417.13d370ca9.orig/cts/Makefile.am
+++ pacemaker-2.0.1+20190417.13d370ca9/cts/Makefile.am
@@ -42,6 +42,7 @@ ctslib_PYTHON = __init__.py \
ctsdir = $(testdir)/cts
cts_DATA = pacemaker-cts-dummyd@.service
+dist_cts_DATA = cts.conf
if BUILD_UPSTART
cts_DATA += pacemaker-cts-dummyd.conf
Index: pacemaker-2.0.1+20190417.13d370ca9/cts/cts-support.in
===================================================================
--- pacemaker-2.0.1+20190417.13d370ca9.orig/cts/cts-support.in
+++ pacemaker-2.0.1+20190417.13d370ca9/cts/cts-support.in
@@ -23,6 +23,7 @@ CRM_EX_ERROR=1
CRM_EX_USAGE=64
UNIT_DIR="@systemdunitdir@"
+RUNTIME_UNIT_DIR="@runstatedir@/systemd/system"
LIBEXEC_DIR="@libexecdir@/pacemaker"
INIT_DIR="@INITDIR@"
SBIN_DIR="@sbindir@"
@@ -31,6 +32,8 @@ UPSTART_DIR="/etc/init"
DUMMY_DAEMON="pacemaker-cts-dummyd"
DUMMY_DAEMON_UNIT="pacemaker-cts-dummyd@.service"
+COROSYNC_RUNTIME_UNIT="corosync.service.d"
+COROSYNC_RUNTIME_CONF="cts.conf"
LSB_DUMMY="LSBDummy"
UPSTART_DUMMY="pacemaker-cts-dummyd.conf"
@@ -71,6 +74,12 @@ support_uninstall() {
systemctl daemon-reload # Ignore failure
fi
+ if [ -e "$RUNTIME_UNIT_DIR/$COROSYNC_RUNTIME_UNIT" ]; then
+ echo "Removing $RUNTIME_UNIT_DIR/$COROSYNC_RUNTIME_UNIT ..."
+ rm -rf "$RUNTIME_UNIT_DIR/$COROSYNC_RUNTIME_UNIT"
+ systemctl daemon-reload # Ignore failure
+ fi
+
for FILE in \
"$LIBEXEC_DIR/$DUMMY_DAEMON" \
"$UPSTART_DIR/$UPSTART_DUMMY" \
@@ -107,6 +116,15 @@ support_install() {
systemctl daemon-reload # Ignore failure
fi
+ if [ -d "$RUNTIME_UNIT_DIR" ]; then
+
+ echo "Installing $COROSYNC_RUNTIME_CONF to $RUNTIME_UNIT_DIR/$COROSYNC_RUNTIME_UNIT ..."
+ mkdir -p "$RUNTIME_UNIT_DIR/$COROSYNC_RUNTIME_UNIT"
+ install -m 0644 "$COROSYNC_RUNTIME_CONF" "$RUNTIME_UNIT_DIR/$COROSYNC_RUNTIME_UNIT" || return $CRM_EX_ERROR
+
+ systemctl daemon-reload # Ignore failure
+ fi
+
echo "Installing $FENCE_DUMMY to $SBIN_DIR ..."
mkdir -p "$SBIN_DIR"
install -m 0755 "$FENCE_DUMMY" "$SBIN_DIR" || return $CRM_EX_ERROR
Index: pacemaker-2.0.1+20190417.13d370ca9/cts/cts.conf
===================================================================
--- /dev/null
+++ pacemaker-2.0.1+20190417.13d370ca9/cts/cts.conf
@@ -0,0 +1,3 @@
+[Service]
+Restart=always
+RestartSec=70