Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
f48def409d
|
@ -86,6 +86,14 @@
|
||||||
<variable name='rdClMemberSlaveRole' type='string' description="Rôle de l'instance secondaire" hidden='True'/>
|
<variable name='rdClMemberSlaveRole' type='string' description="Rôle de l'instance secondaire" hidden='True'/>
|
||||||
<variable name='rdClMemberSlaveMaster' type='string' description="Noeud du noeud répliquer sur cette instance secondaire"/>
|
<variable name='rdClMemberSlaveMaster' type='string' description="Noeud du noeud répliquer sur cette instance secondaire"/>
|
||||||
</family>
|
</family>
|
||||||
|
<family name='Redis tunning' mode='expert'>
|
||||||
|
<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>
|
||||||
|
</family>
|
||||||
<separators>
|
<separators>
|
||||||
<separator name='redisInstanceName'>Instance Principale</separator>
|
<separator name='redisInstanceName'>Instance Principale</separator>
|
||||||
<separator name='redisSlaveInstanceName'>Instance Secondaire</separator>
|
<separator name='redisSlaveInstanceName'>Instance Secondaire</separator>
|
||||||
|
|
|
@ -807,7 +807,7 @@ activerehashing yes
|
||||||
#
|
#
|
||||||
# Both the hard or the soft limit can be disabled by setting them to zero.
|
# Both the hard or the soft limit can be disabled by setting them to zero.
|
||||||
client-output-buffer-limit normal 0 0 0
|
client-output-buffer-limit normal 0 0 0
|
||||||
client-output-buffer-limit slave 256mb 64mb 60
|
client-output-buffer-limit slave %%{rdCliOutBuffHardLimit}mb %%{rdCliOutBuffSoftLimit}mb 60
|
||||||
client-output-buffer-limit pubsub 32mb 8mb 60
|
client-output-buffer-limit pubsub 32mb 8mb 60
|
||||||
|
|
||||||
# Redis calls an internal function to perform many background tasks, like
|
# Redis calls an internal function to perform many background tasks, like
|
||||||
|
|
|
@ -809,7 +809,7 @@ activerehashing yes
|
||||||
#
|
#
|
||||||
# Both the hard or the soft limit can be disabled by setting them to zero.
|
# Both the hard or the soft limit can be disabled by setting them to zero.
|
||||||
client-output-buffer-limit normal 0 0 0
|
client-output-buffer-limit normal 0 0 0
|
||||||
client-output-buffer-limit slave 256mb 64mb 60
|
client-output-buffer-limit slave %%{rdCliOutBuffHardLimit}mb %%{rdCliOutBuffSoftLimit}mb 60
|
||||||
client-output-buffer-limit pubsub 32mb 8mb 60
|
client-output-buffer-limit pubsub 32mb 8mb 60
|
||||||
|
|
||||||
# Redis calls an internal function to perform many background tasks, like
|
# Redis calls an internal function to perform many background tasks, like
|
||||||
|
|
Loading…
Reference in New Issue