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