rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check that JedisSentinelPool accepts closing connections before and after failover

Browse Source
This commit is contained in:
Nelson Rodrigues
2014-07-28 11:34:00 -07:00
parent 9013078d40
commit c02c663776
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
View File

@@ -47,6 +47,8 @@ public class JedisSentinelPoolTest extends JedisTestBase {
new GenericObjectPoolConfig(), 1000, "foobared", 2); new GenericObjectPoolConfig(), 1000, "foobared", 2);
forceFailover(pool); forceFailover(pool);
// after failover sentinel needs a bit of time to stabilize before a new failover
Thread.sleep(100);
forceFailover(pool); forceFailover(pool);
// you can test failover as much as possible // you can test failover as much as possible
@@ -140,18 +142,19 @@ public class JedisSentinelPoolTest extends JedisTestBase {
HostAndPort oldMaster = pool.getCurrentHostMaster(); HostAndPort oldMaster = pool.getCurrentHostMaster();
// jedis connection should be master // jedis connection should be master
Jedis jedis = pool.getResource(); Jedis beforeFailoverJedis = pool.getResource();
assertEquals("PONG", jedis.ping()); assertEquals("PONG", beforeFailoverJedis.ping());
waitForFailover(pool, oldMaster); waitForFailover(pool, oldMaster);
// JedisSentinelPool recognize master but may not changed internal pool
// yet
Thread.sleep(100);
jedis = pool.getResource(); Jedis afterFailoverJedis = pool.getResource();
assertEquals("PONG", jedis.ping()); assertEquals("PONG", afterFailoverJedis.ping());
assertEquals("foobared", jedis.configGet("requirepass").get(1)); assertEquals("foobared", afterFailoverJedis.configGet("requirepass").get(1));
assertEquals(2, jedis.getDB().intValue()); assertEquals(2, afterFailoverJedis.getDB().intValue());
// returning both connections to the pool should not throw
beforeFailoverJedis.close();
afterFailoverJedis.close();
} }
private void waitForFailover(JedisSentinelPool pool, HostAndPort oldMaster) private void waitForFailover(JedisSentinelPool pool, HostAndPort oldMaster)
@@ -167,10 +170,9 @@ public class JedisSentinelPoolTest extends JedisTestBase {
throws InterruptedException { throws InterruptedException {
while (true) { while (true) {
String host = pool.getCurrentHostMaster().getHost(); HostAndPort currentHostMaster = pool.getCurrentHostMaster();
int port = pool.getCurrentHostMaster().getPort();
if (host.equals(newMaster.getHost()) && port == newMaster.getPort()) if (newMaster.equals(currentHostMaster))
break; break;
System.out System.out