256ebe
From 3cb9ed7e20f59eec036908eed4cfdbc61e990ee2 Mon Sep 17 00:00:00 2001
256ebe
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
256ebe
Date: Tue, 11 Dec 2018 10:09:42 -0500
256ebe
Subject: [PATCH 081/124] ganesha-ha: ensure pacemaker is enabled after setup
256ebe
256ebe
There appears to be a race between `pcs cluster setup ...` early
256ebe
in the setup and the `systemctl enable pacemaker` at the end. The
256ebe
`pcs cluster setup ...` disables pacemaker and corosync. (Now, in
256ebe
pacemaker-1.1.18. Was it always the case?)
256ebe
256ebe
I am not able to reproduce this on my devel system. I speculate that
256ebe
on a busy system that the `pcs cluster setup ...` disable may, under
256ebe
the right conditions, not run until after the setup script enables
256ebe
it. It must require the right alignment of the Sun, Moon, and all
256ebe
the planets.
256ebe
256ebe
Regardless, we'll use the --enable option to `pcs cluster setup ...`
256ebe
to ensure that the cluster (re)starts pacemaker.
256ebe
256ebe
Label: DOWNSTREAM ONLY
256ebe
256ebe
Change-Id: I771ff62c37426438b80e61651a8b4ecaf2d549c3
256ebe
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
256ebe
Reviewed-on: https://code.engineering.redhat.com/gerrit/167166
256ebe
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
256ebe
Tested-by: RHGS Build Bot <nigelb@redhat.com>
256ebe
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
256ebe
---
256ebe
 extras/ganesha/scripts/ganesha-ha.sh | 4 ++--
256ebe
 1 file changed, 2 insertions(+), 2 deletions(-)
256ebe
256ebe
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
256ebe
index 4a98f32..32af1ca 100644
256ebe
--- a/extras/ganesha/scripts/ganesha-ha.sh
256ebe
+++ b/extras/ganesha/scripts/ganesha-ha.sh
256ebe
@@ -195,9 +195,9 @@ setup_cluster()
256ebe
 
256ebe
     pcs cluster auth ${servers}
256ebe
     # pcs cluster setup --name ${name} ${servers}
256ebe
-    pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --transport udpu ${servers}
256ebe
+    pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --enable --transport udpu ${servers}
256ebe
     if [ $? -ne 0 ]; then
256ebe
-        logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers} failed"
256ebe
+        logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --enable --transport udpu ${servers} failed"
256ebe
         #set up failed stop all ganesha process and clean up symlinks in cluster
256ebe
         stop_ganesha_all "${servers}"
256ebe
         exit 1;
256ebe
-- 
256ebe
1.8.3.1
256ebe