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

Master branch for 2.7.2
Master branch for 2.7.1
2020-06-17 12:35:12 +02:00 · 2020-06-17 12:28:33 +02:00 · 2020-06-17 12:27:07 +02:00 · 2020-06-17 12:24:59 +02:00 · 2020-06-17 12:16:28 +02:00 · 2020-06-17 12:16:28 +02:00
4 changed files with 7 additions and 23 deletions
--- a/4
+++ b/4
@ -4,8 +4,8 @@

 SOURCE=eole-redis
 VERSION=0.0.1
-EOLE_VERSION=2.6
-EOLE_RELEASE=2.6.2
+EOLE_VERSION=2.7
+EOLE_RELEASE=2.7.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>

--- a/README.md
+++ b/README.md
@ -1,5 +1,3 @@
 # eole-redis

 Redis EOLE integration
-
-## To fix :
--- a/dicos/90_redis.xml
+++ b/dicos/90_redis.xml
@ -2,6 +2,7 @@
 <creole>
    <files>
        <!-- System configuration -->
+        <file filelist='redis' name='/etc/sysctl.d/100-redis-tuning.conf' source='redis_sysctl.conf' mkdir='True' rm='True'/>
        <file filelist='redis' name='/etc/redis/redis.conf' mkdir='True' rm='True'/>
        <file filelist='redisSlave' name='/etc/redis/redis-slave.conf' mkdir='True' rm='True'/>
        <file filelist='redisCl' name='/etc/redis/cluster.conf' source='redis-cluster.conf' mkdir='True' rm='True'/>
@ -243,35 +244,18 @@
            <param>slave</param>
        </auto>

-        <fill name='intAdd' target='rdClMemberSlavePort'>
-            <param type='eole' name='num1'>rdClMemberPort</param>
-            <param name='num2'>2000</param>
-        </fill>
-
        <fill name='calc_val' target='redisInstanceName'>
            <param type='eole' name='valeur'>nom_machine</param>
        </fill>

-        <fill name='intAdd' target='redisClPort'>
-            <param type='eole' name='num1'>redisPort</param>
-            <param name='num2'>10000</param>
-        </fill>
-
-        <fill name='intAdd' target='redisPortSlave'>
-            <param type='eole' name='num1'>redisPort</param>
-            <param name='num2'>2000</param>
-        </fill>
-
-        <fill name='intAdd' target='redisClPortSlave'>
-            <param type='eole' name='num1'>redisPortSlave</param>
-            <param name='num2'>10000</param>
-        </fill>
        <fill name='calc_val' target='redisMaxMemorySlave'>
            <param type='eole' name='valeur'>redisMaxMemory</param>
        </fill>
+
        <fill name='calc_val' target='redisMemoryPolicySlave'>
            <param type='eole' name='valeur'>redisMemoryPolicy</param>
        </fill>
+        
        <fill name='calc_val' target='redisTCPKeepAliveSlave'>
            <param type='eole' name='valeur'>redisTCPKeepAlive</param>
        </fill>
--- a/tmpl/redis_sysctl.conf
+++ b/tmpl/redis_sysctl.conf
@ -0,0 +1,2 @@
+
+net.core.somaxconn = 512
Author	SHA1	Message	Date
Philippe Caseiro	80ab344f26	Merge branch '2.7.2/master' into dist/eole/2.7.2/master	2020-06-17 12:35:12 +02:00
Philippe Caseiro	9efa0e143c	Master branch for 2.7.2	2020-06-17 12:28:33 +02:00
Philippe Caseiro	84320f3366	Master branch for 2.7.1	2020-06-17 12:27:07 +02:00
Philippe Caseiro	d1675859fd	Master branch for 2.7.0	2020-06-17 12:24:59 +02:00
Teddy Cornaut	e5b4489a8d	Suppression des addInt qui empechent d'utiliser le dico dans zephir	2020-06-17 12:16:28 +02:00
Teddy Cornaut	001e9fa0f5	Ajout conf sysctl	2020-06-17 12:16:28 +02:00
Teddy Cornaut	296250e50a	Ajout service redis slave	2020-06-17 12:16:28 +02:00
Emmanuel Garette	47a201c879	remove redis2-server	2020-06-17 12:16:28 +02:00
Emmanuel Garette	7d7154ac1a	corrections	2020-06-17 12:16:28 +02:00
Teddy Cornaut	b078384b50	Fix init	2020-06-17 12:16:28 +02:00
Teddy Cornaut	470e446bed	Fix variable redisMaxMemory dans conf	2020-06-17 12:16:28 +02:00
Teddy Cornaut	ef49699351	Cluster non présent par défaut sur les slaves + desactivation des sauvegardes auto RDB et AOF	2020-06-17 12:16:28 +02:00
Teddy Cornaut	5701b488ab	Correction du mode local avec slave distant	2020-06-17 12:16:28 +02:00
Teddy Cornaut	f331bdd8bb	Ajout du mode local avec slave distant	2020-06-17 12:16:28 +02:00
Philippe Caseiro	7d205a6d07	Fix typo	2020-06-17 12:16:28 +02:00
Philippe Caseiro	ef4e0deb13	Adding maxclients support	2020-06-17 12:16:28 +02:00
Philippe Caseiro	e6db8285fd	Disable Transparent Huge Page support	2020-06-17 12:16:28 +02:00
Philippe Caseiro	5c5152546f	Fixing typo in dico	2020-06-17 12:16:28 +02:00
Philippe Caseiro	9b2317478f	Adding Possibility to disable persistence on Master instances	2020-06-17 12:16:28 +02:00
Philippe Caseiro	593a35a6fd	Adding somme tunning for better slave sync	2020-06-17 12:16:27 +02:00
Philippe Caseiro	20410f4168	Adding vm.overcommit_memory kernel parameter	2020-06-17 12:16:27 +02:00
Philippe Caseiro	e79473b41e	Hidding variable not usable in with Node Rôle	2020-06-17 12:16:27 +02:00
Philippe Caseiro	ed7ef726ee	Hidding variable not usable in with Node Rôle	2020-06-17 12:16:27 +02:00
Philippe Caseiro	6183e0b01d	Fixing pid file name	2020-06-17 12:16:27 +02:00
Philippe Caseiro	88d3ae8308	Addin Service file for the second instance	2020-06-17 12:16:27 +02:00
Philippe Caseiro	2cb3b1eab0	Adding support for a second instance ! Redis cluster needs 6 hosts for work ... it's a lot. To trick him each node can be Master and slave for another node. ;)	2020-06-17 12:16:27 +02:00
Philippe Caseiro	d24fb913d1	Improving cluster init script	2020-06-17 12:16:27 +02:00
Philippe Caseiro	1b0cc0ddb1	We need to open en Cluster port ... redis port + 10000	2020-06-17 12:16:27 +02:00
Philippe Caseiro	9ee6f06cf3	Adding a working init script !!!	2020-06-17 12:16:27 +02:00
Philippe Caseiro	9ac6a32a75	Fixing bad service name	2020-06-17 12:16:27 +02:00
Philippe Caseiro	d53d35594b	Using eth0 IP instead of 127.0.0.1	2020-06-17 12:16:27 +02:00
Philippe Caseiro	9b589c4306	Enable cluster mode for nodes and leader	2020-06-17 12:16:27 +02:00
Philippe Caseiro	95b110a614	Open redis to other hosts	2020-06-17 12:16:27 +02:00
Philippe Caseiro	52fb5f9e6f	Hidding variables on 'Node' Mode	2020-06-17 12:16:27 +02:00
Philippe Caseiro	6c8bfc86ad	Removing missing variable from template	2020-06-17 12:16:27 +02:00
Philippe Caseiro	6129031de4	Removing unused configuration and assocated variables	2020-06-17 12:16:27 +02:00
Philippe Caseiro	8bc6371d33	Fix configuration and dico	2020-06-17 12:16:27 +02:00
Philippe Caseiro	9cad108279	Removing non working script (moved to a branch)	2020-06-17 12:16:27 +02:00
Philippe Caseiro	46cbb60a12	Using redis-trib.rb because it works ...	2020-06-17 12:16:27 +02:00
Philippe Caseiro	dc15a5722c	Adding the script	2020-06-17 12:16:27 +02:00
Philippe Caseiro	7542bc4ca9	Adding init script for cluster start	2020-06-17 12:16:27 +02:00
Philippe Caseiro	d289e3c71c	Adding the Leader to the cluster.conf	2020-06-17 12:16:27 +02:00
Philippe Caseiro	48f9f8e927	Adding cluster.conf template	2020-06-17 12:16:27 +02:00
Philippe Caseiro	9af98166ba	Adding cluster.conf template	2020-06-17 12:16:27 +02:00
Philippe Caseiro	935aa81b70	rdClMemberIP is a Multi	2020-06-17 12:16:27 +02:00
Philippe Caseiro	a5b5f9fc32	Gestion des noeuds membres	2020-06-17 12:16:27 +02:00
Philippe Caseiro	7c40c395ec	Fist commit	2020-06-17 12:16:26 +02:00
admineole@ac-dijon.fr	8776d25aee	Add README file	2020-06-17 11:51:27 +02:00
Teddy Cornaut	c60d652730	Merge branch 'master' into dist/eole/2.7.0/master	2019-04-11 11:27:33 +02:00
Teddy Cornaut	9bfa3a41f5	Ajout conf sysctl	2019-04-11 11:25:40 +02:00