diff --git a/Makefile b/Makefile index 66d6e98a05..1ac2bb92f0 100644 --- a/Makefile +++ b/Makefile @@ -44,39 +44,39 @@ appendonly no slaveof localhost 6381 endef -define REDIS6_CONF +define REDIS5_CONF daemonize yes -port 6384 +port 6383 requirepass foobared masterauth foobared -pidfile /tmp/redis6.pid -logfile /tmp/redis6.log +pidfile /tmp/redis5.pid +logfile /tmp/redis5.log save "" appendonly no slaveof localhost 6379 endef -define REDIS7_CONF +define REDIS6_CONF daemonize yes -port 6385 +port 6384 requirepass foobared masterauth foobared -pidfile /tmp/redis7.pid -logfile /tmp/redis7.log +pidfile /tmp/redis6.pid +logfile /tmp/redis6.log save "" appendonly no endef -define REDIS8_CONF +define REDIS7_CONF daemonize yes -port 6386 +port 6385 requirepass foobared masterauth foobared -pidfile /tmp/redis8.pid -logfile /tmp/redis8.log +pidfile /tmp/redis7.pid +logfile /tmp/redis7.log save "" appendonly no -slaveof localhost 6385 +slaveof localhost 6384 endef # SENTINELS @@ -104,16 +104,16 @@ pidfile /tmp/sentinel2.pid logfile /tmp/sentinel2.log endef -define REDIS_SENTINEL4 -port 26382 +define REDIS_SENTINEL3 +port 26381 daemonize yes -sentinel monitor mymasterfailover 127.0.0.1 6385 1 +sentinel monitor mymasterfailover 127.0.0.1 6384 1 sentinel auth-pass mymasterfailover foobared sentinel down-after-milliseconds mymasterfailover 2000 sentinel failover-timeout mymasterfailover 120000 sentinel parallel-syncs mymasterfailover 1 -pidfile /tmp/sentinel4.pid -logfile /tmp/sentinel4.log +pidfile /tmp/sentinel3.pid +logfile /tmp/sentinel3.log endef # CLUSTER REDIS NODES @@ -157,12 +157,12 @@ export REDIS1_CONF export REDIS2_CONF export REDIS3_CONF export REDIS4_CONF +export REDIS5_CONF export REDIS6_CONF export REDIS7_CONF -export REDIS8_CONF export REDIS_SENTINEL1 export REDIS_SENTINEL2 -export REDIS_SENTINEL4 +export REDIS_SENTINEL3 export REDIS_CLUSTER_NODE1_CONF export REDIS_CLUSTER_NODE2_CONF export REDIS_CLUSTER_NODE3_CONF @@ -172,14 +172,14 @@ start: cleanup echo "$$REDIS2_CONF" | redis-server - echo "$$REDIS3_CONF" | redis-server - echo "$$REDIS4_CONF" | redis-server - + echo "$$REDIS5_CONF" | redis-server - echo "$$REDIS6_CONF" | redis-server - echo "$$REDIS7_CONF" | redis-server - - echo "$$REDIS8_CONF" | redis-server - echo "$$REDIS_SENTINEL1" > /tmp/sentinel1.conf && redis-server /tmp/sentinel1.conf --sentinel @sleep 0.5 echo "$$REDIS_SENTINEL2" > /tmp/sentinel2.conf && redis-server /tmp/sentinel2.conf --sentinel @sleep 0.5 - echo "$$REDIS_SENTINEL4" > /tmp/sentinel4.conf && redis-server /tmp/sentinel4.conf --sentinel + echo "$$REDIS_SENTINEL3" > /tmp/sentinel3.conf && redis-server /tmp/sentinel3.conf --sentinel echo "$$REDIS_CLUSTER_NODE1_CONF" | redis-server - echo "$$REDIS_CLUSTER_NODE2_CONF" | redis-server - echo "$$REDIS_CLUSTER_NODE3_CONF" | redis-server - @@ -193,18 +193,18 @@ stop: kill `cat /tmp/redis2.pid` kill `cat /tmp/redis3.pid` kill `cat /tmp/redis4.pid` + kill `cat /tmp/redis5.pid` kill `cat /tmp/redis6.pid` kill `cat /tmp/redis7.pid` - kill `cat /tmp/redis8.pid` kill `cat /tmp/sentinel1.pid` kill `cat /tmp/sentinel2.pid` - kill `cat /tmp/sentinel4.pid` + kill `cat /tmp/sentinel3.pid` kill `cat /tmp/redis_cluster_node1.pid` || true kill `cat /tmp/redis_cluster_node2.pid` || true kill `cat /tmp/redis_cluster_node3.pid` || true rm -f /tmp/sentinel1.conf rm -f /tmp/sentinel2.conf - rm -f /tmp/sentinel4.conf + rm -f /tmp/sentinel3.conf rm -f /tmp/redis_cluster_node1.conf rm -f /tmp/redis_cluster_node2.conf rm -f /tmp/redis_cluster_node3.conf diff --git a/pom.xml b/pom.xml index 064af01d9e..7008df1cae 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,8 @@ - localhost:6379,localhost:6380,localhost:6381,localhost:6382,localhost:6383,localhost:6384,localhost:6385,localhost:6386 - localhost:26379,localhost:26380,localhost:26381,localhost:26382 + localhost:6379,localhost:6380,localhost:6381,localhost:6382,localhost:6383,localhost:6384,localhost:6385 + localhost:26379,localhost:26380,localhost:26381 localhost:7379,localhost:7380,localhost:7381 github diff --git a/src/test/java/redis/clients/jedis/tests/HostAndPortUtil.java b/src/test/java/redis/clients/jedis/tests/HostAndPortUtil.java index 491f0a354b..cb7a58b997 100644 --- a/src/test/java/redis/clients/jedis/tests/HostAndPortUtil.java +++ b/src/test/java/redis/clients/jedis/tests/HostAndPortUtil.java @@ -23,7 +23,6 @@ public class HostAndPortUtil { sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT)); sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 1)); sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 2)); - sentinelHostAndPortList.add(new HostAndPort("localhost", Protocol.DEFAULT_SENTINEL_PORT + 3)); clusterHostAndPortList.add(new HostAndPort("localhost", 7379)); clusterHostAndPortList.add(new HostAndPort("localhost", 7380)); diff --git a/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java b/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java index 4b0e06fd44..c8df9c51d8 100644 --- a/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java +++ b/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java @@ -21,8 +21,6 @@ public class JedisSentinelPoolTest extends JedisTestBase { .get(2); protected static HostAndPort slave1 = HostAndPortUtil.getRedisServers() .get(3); - protected static HostAndPort slave2 = HostAndPortUtil.getRedisServers() - .get(4); protected static HostAndPort sentinel1 = HostAndPortUtil .getSentinelServers().get(1); diff --git a/src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java b/src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java index 7e9a97a975..822c659eb2 100644 --- a/src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java +++ b/src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java @@ -22,15 +22,15 @@ public class JedisSentinelTest extends JedisTestBase { protected static HostAndPort master = HostAndPortUtil.getRedisServers() .get(0); - protected static HostAndPort slave = HostAndPortUtil.getRedisServers().get( - 5); + protected static HostAndPort slave = HostAndPortUtil.getRedisServers() + .get(4); protected static HostAndPort sentinel = HostAndPortUtil .getSentinelServers().get(0); protected static HostAndPort sentinelForFailover = HostAndPortUtil - .getSentinelServers().get(3); + .getSentinelServers().get(2); protected static HostAndPort masterForFailover = HostAndPortUtil - .getRedisServers().get(6); + .getRedisServers().get(5); @Before public void setup() throws InterruptedException { @@ -87,11 +87,10 @@ public void sentinelFailover() throws InterruptedException { sentinelForFailover.getPort()); try { - HostAndPort currentMaster = new HostAndPort( - masterForFailover.getHost(), masterForFailover.getPort()); - List masterHostAndPort = j .sentinelGetMasterAddrByName(FAILOVER_MASTER_NAME); + HostAndPort currentMaster = new HostAndPort(masterHostAndPort.get(0), + Integer.parseInt(masterHostAndPort.get(1))); String result = j.sentinelFailover(FAILOVER_MASTER_NAME); assertEquals("OK", result);