|
 |
21ab4e |
From e3cac5cc264e184faff4359932f91a63de91f2cb Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
|
|
|
21ab4e |
Date: Thu, 11 May 2017 09:33:17 -0400
|
|
|
21ab4e |
Subject: [PATCH 450/473] common-ha: adding a node to existing cluster failed
|
|
|
21ab4e |
to start pacemaker
|
|
|
21ab4e |
|
|
|
21ab4e |
`pcs cluster start` in add_node() needs to wait for SSL certs to
|
|
|
21ab4e |
propagate, etc. -- just like setup.
|
|
|
21ab4e |
|
|
|
21ab4e |
release-3.10 Change-Id: I44876305630a82e471824c085ed9ac58df08caa2
|
|
|
21ab4e |
release-3.10 https://review.gluster.org/#/c/17255/
|
|
|
21ab4e |
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
21ab4e |
BUG: 1441783
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I62e3a5dfceedea57727bd300c03fb3d6ffb481b8
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/105948
|
|
|
21ab4e |
Tested-by: Kaleb Keithley <kkeithle@redhat.com>
|
|
|
21ab4e |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
extras/ganesha/scripts/ganesha-ha.sh | 48 ++++++++++++++++++------------------
|
|
|
21ab4e |
1 file changed, 24 insertions(+), 24 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
21ab4e |
index 473c628..4bea9c3 100644
|
|
|
21ab4e |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
21ab4e |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
21ab4e |
@@ -175,24 +175,8 @@ determine_servers()
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
|
|
|
21ab4e |
-setup_cluster()
|
|
|
21ab4e |
+start_cluster()
|
|
|
21ab4e |
{
|
|
|
21ab4e |
- local name=${1}
|
|
|
21ab4e |
- local num_servers=${2}
|
|
|
21ab4e |
- local servers=${3}
|
|
|
21ab4e |
- local unclean=""
|
|
|
21ab4e |
- local quorum_policy="stop"
|
|
|
21ab4e |
-
|
|
|
21ab4e |
- logger "setting up cluster ${name} with the following ${servers}"
|
|
|
21ab4e |
-
|
|
|
21ab4e |
- pcs cluster auth ${servers}
|
|
|
21ab4e |
- # pcs cluster setup --name ${name} ${servers}
|
|
|
21ab4e |
- pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --transport udpu ${servers}
|
|
|
21ab4e |
- if [ $? -ne 0 ]; then
|
|
|
21ab4e |
- logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers} failed"
|
|
|
21ab4e |
- exit 1;
|
|
|
21ab4e |
- fi
|
|
|
21ab4e |
-
|
|
|
21ab4e |
# BZ 1284404, 1425110, allow time for SSL certs to propagate, until then
|
|
|
21ab4e |
# pcsd will not accept connections.
|
|
|
21ab4e |
sleep 12
|
|
|
21ab4e |
@@ -215,6 +199,27 @@ setup_cluster()
|
|
|
21ab4e |
unclean=$(pcs status | grep -u "UNCLEAN")
|
|
|
21ab4e |
done
|
|
|
21ab4e |
sleep 1
|
|
|
21ab4e |
+}
|
|
|
21ab4e |
+
|
|
|
21ab4e |
+setup_cluster()
|
|
|
21ab4e |
+{
|
|
|
21ab4e |
+ local name=${1}
|
|
|
21ab4e |
+ local num_servers=${2}
|
|
|
21ab4e |
+ local servers=${3}
|
|
|
21ab4e |
+ local unclean=""
|
|
|
21ab4e |
+ local quorum_policy="stop"
|
|
|
21ab4e |
+
|
|
|
21ab4e |
+ logger "setting up cluster ${name} with the following ${servers}"
|
|
|
21ab4e |
+
|
|
|
21ab4e |
+ pcs cluster auth ${servers}
|
|
|
21ab4e |
+ # pcs cluster setup --name ${name} ${servers}
|
|
|
21ab4e |
+ pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} --transport udpu ${servers}
|
|
|
21ab4e |
+ if [ $? -ne 0 ]; then
|
|
|
21ab4e |
+ logger "pcs cluster setup ${RHEL6_PCS_CNAME_OPTION} ${name} ${servers} failed"
|
|
|
21ab4e |
+ exit 1;
|
|
|
21ab4e |
+ fi
|
|
|
21ab4e |
+
|
|
|
21ab4e |
+ start_cluster
|
|
|
21ab4e |
|
|
|
21ab4e |
if [ ${num_servers} -lt 3 ]; then
|
|
|
21ab4e |
quorum_policy="ignore"
|
|
|
21ab4e |
@@ -1035,14 +1040,10 @@ main()
|
|
|
21ab4e |
# restart of HA cluster required on RHEL 6 because of BZ1404410
|
|
|
21ab4e |
pcs cluster stop --all
|
|
|
21ab4e |
if [ $? -ne 0 ]; then
|
|
|
21ab4e |
- logger "warning: pcs cluster stopping cluster failed"
|
|
|
21ab4e |
+ logger "warning: pcs cluster stop failed"
|
|
|
21ab4e |
fi
|
|
|
21ab4e |
|
|
|
21ab4e |
- sleep 2
|
|
|
21ab4e |
- pcs cluster start --all
|
|
|
21ab4e |
- if [ $? -ne 0 ]; then
|
|
|
21ab4e |
- logger "warning: pcs cluster starting cluster failed"
|
|
|
21ab4e |
- fi
|
|
|
21ab4e |
+ start_cluster
|
|
|
21ab4e |
|
|
|
21ab4e |
addnode_create_resources ${node} ${vip}
|
|
|
21ab4e |
# Subsequent add-node recreates resources for all the nodes
|
|
|
21ab4e |
@@ -1050,7 +1051,6 @@ main()
|
|
|
21ab4e |
# from the entries in the ganesha-ha.conf file. Adding the
|
|
|
21ab4e |
# newly added node to the file so that the resources specfic
|
|
|
21ab4e |
# to this node is correctly recreated in the future.
|
|
|
21ab4e |
- clean_node=${node//[-.]/_}
|
|
|
21ab4e |
echo "VIP_${node}=\"${vip}\"" >> ${HA_CONFDIR}/ganesha-ha.conf
|
|
|
21ab4e |
|
|
|
21ab4e |
NEW_NODES="$HA_CLUSTER_NODES,${node}"
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|