Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
Philippe Caseiro 2018-06-21 10:38:34 +02:00
commit 8d25de0f2a
1 changed files with 7 additions and 3 deletions

View File

@ -158,9 +158,8 @@ do
MASTERS+=([${name}]=${master})
done < ${CONF}
# If the cluster is "ok" don't do anything
st=$(redisClusterIsOK ${LeaderIP} ${LeaderPort})
[[ ${?} -eq 0 ]] && exit 0
# Disable Transparent Huge Page support on kernel
echo never > /sys/kernel/mm/transparent_hugepage/enabled
if [[ ${1} == "forget" ]]
then
@ -168,6 +167,10 @@ then
exit ${?}
fi
# If the cluster is "ok" don't do anything
st=$(redisClusterIsOK ${LeaderIP} ${LeaderPort})
[[ ${?} -eq 0 ]] && exit 0
if [[ -e ${INITFLAG} ]]
then
@ -247,5 +250,6 @@ echo
redisRun ${LeaderIP} ${LeaderPort} cluster info
echo
touch ${INITFLAG}
exit 0