From e3cac5cc264e184faff4359932f91a63de91f2cb Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 11 May 2017 09:33:17 -0400
Subject: [PATCH 450/473] common-ha: adding a node to existing cluster failed
 to start pacemaker

`pcs cluster start` in add_node() needs to wait for SSL certs to
propagate, etc. -- just like setup.

release-3.10 Change-Id: I44876305630a82e471824c085ed9ac58df08caa2
release-3.10 https://review.gluster.org/#/c/17255/
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
BUG: 1441783

Change-Id: I62e3a5dfceedea57727bd300c03fb3d6ffb481b8
Reviewed-on: https://code.engineering.redhat.com/gerrit/105948
Tested-by: Kaleb Keithley <kkeithle@redhat.com>
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 extras/ganesha/scripts/ganesha-ha.sh | 48 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index 473c628..4bea9c3 100644
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -175,24 +175,8 @@ determine_servers()
 }
 
 
-setup_cluster()
+start_cluster()
 {
-    local name=${1}
-    local num_servers=${2}
-    local servers=${3}
-    local unclean=""
-    local quorum_policy="stop"
-
-    logger "setting up cluster ${name} with the following ${servers}"
-
-    pcs cluster auth ${servers}
-    # pcs cluster setup --name ${name} ${servers}
-    pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --transport udpu ${servers}
-    if [ $? -ne 0 ]; then
-        logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers} failed"
-        exit 1;
-    fi
-
     # BZ 1284404, 1425110, allow time for SSL certs to propagate, until then
     # pcsd will not accept connections.
     sleep 12
@@ -215,6 +199,27 @@ setup_cluster()
          unclean=$(pcs status | grep -u "UNCLEAN")
     done
     sleep 1
+}
+
+setup_cluster()
+{
+    local name=${1}
+    local num_servers=${2}
+    local servers=${3}
+    local unclean=""
+    local quorum_policy="stop"
+
+    logger "setting up cluster ${name} with the following ${servers}"
+
+    pcs cluster auth ${servers}
+    # pcs cluster setup --name ${name} ${servers}
+    pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --transport udpu ${servers}
+    if [ $? -ne 0 ]; then
+        logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers} failed"
+        exit 1;
+    fi
+
+    start_cluster
 
     if [ ${num_servers} -lt 3 ]; then
         quorum_policy="ignore"
@@ -1035,14 +1040,10 @@ main()
         # restart of HA cluster required on RHEL 6 because of BZ1404410
         pcs cluster stop --all
         if [ $? -ne 0 ]; then
-            logger "warning: pcs cluster stopping cluster failed"
+            logger "warning: pcs cluster stop failed"
         fi
 
-        sleep 2
-        pcs cluster start --all
-        if [ $? -ne 0 ]; then
-            logger "warning: pcs cluster starting cluster failed"
-        fi
+        start_cluster
 
         addnode_create_resources ${node} ${vip}
         # Subsequent add-node recreates resources for all the nodes
@@ -1050,7 +1051,6 @@ main()
         # from the entries in the ganesha-ha.conf file. Adding the
         # newly added node to the file so that the resources specfic
         # to this node is correctly recreated in the future.
-        clean_node=${node//[-.]/_}
         echo "VIP_${node}=\"${vip}\"" >> ${HA_CONFDIR}/ganesha-ha.conf
 
         NEW_NODES="$HA_CLUSTER_NODES,${node}"
-- 
1.8.3.1