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

dicos/90_redis.xml

@@ -87,13 +87,16 @@
             <variable name='rdClMemberSlaveMaster' type='string' description="Noeud du noeud répliquer sur cette instance secondaire"/>
         </family>
 		<family name='Redis tunning' mode='expert'>
+			<variable name='redisMaxClients' type='number' description="Maximum allowed clients">
+				<value>10000</value>
+			</variable>
 			<variable name='rdCliOutBuffHardLimit' type='number' description="Client output buffer hard limit (for slave)">
 				<value>512</value>
 			</variable>
 			<variable name='rdCliOutBuffSoftLimit' type='number' description="Client output buffer soft limit (for slave)">
 				<value>256</value>
 			</variable>
-			<variable name='%%rdSaveDisable' type='oui/non' description="Désactiver la presistence des données sur les maitres">
+			<variable name='rdSaveDisable' type='oui/non' description="Désactiver la presistence des données sur les maitres">
 				<value>non</value>
 			</variable>
 		</family>

postservice/90-redis-init

@@ -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

tmpl/redis-slave.conf

@@ -291,7 +291,7 @@ dir /var/lib/redis
 # Once the limit is reached Redis will close all the new connections sending
 # an error 'max number of clients reached'.
 #
-# maxclients 10000
+maxclients %%redisMaxClients
 
 # Don't use more memory than the specified amount of bytes.
 # When the memory limit is reached Redis will try to remove keys

tmpl/redis.conf

@@ -295,7 +295,7 @@ dir /var/lib/redis
 # Once the limit is reached Redis will close all the new connections sending
 # an error 'max number of clients reached'.
 #
-# maxclients 10000
+maxclients %%redisMaxClients
 
 # Don't use more memory than the specified amount of bytes.
 # When the memory limit is reached Redis will try to remove keys