use 1.0.5-rc1 for the dyno-queues-core. Need to get the dyno jedis cl…

…ient fixes in 1.5.6 before upgrading to 1.0.6 version.
Netflix · Dec 9, 2016 · 8eb33a8 · 8eb33a8
1 parent c9fbea4
commit 8eb33a8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/redis-persistence/build.gradle b/redis-persistence/build.gradle
@@ -2,8 +2,8 @@ dependencies {
 
 	compile project(':conductor-core')
 	compile 'com.google.inject:guice:3.0'
-	compile 'com.netflix.dyno:dyno-jedis:1.5.6'
- 	compile 'com.netflix.dyno-queues:dyno-queues-redis:1.0.6'
+	compile ('com.netflix.dyno:dyno-jedis:1.4.7') { force = true}
+ 	compile 'com.netflix.dyno-queues:dyno-queues-redis:1.0.5-rc1'
 	compile 'org.elasticsearch:elasticsearch:2.+'
 
 	//In memory redis for unit testing

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java
@@ -30,10 +30,13 @@
 import com.netflix.conductor.core.config.Configuration;
 import com.netflix.conductor.dao.QueueDAO;
 import com.netflix.discovery.DiscoveryClient;
-import com.netflix.dyno.jedis.DynoJedisClient;
+import com.netflix.dyno.connectionpool.Host;
+import com.netflix.dyno.connectionpool.impl.ConnectionPoolConfigurationImpl;
+import com.netflix.dyno.contrib.EurekaHostsSupplier;
 import com.netflix.dyno.queues.DynoQueue;
 import com.netflix.dyno.queues.Message;
 import com.netflix.dyno.queues.ShardSupplier;
+import com.netflix.dyno.queues.redis.DynoJedisClient;
 import com.netflix.dyno.queues.redis.DynoShardSupplier;
 import com.netflix.dyno.queues.redis.RedisQueues;
 
@@ -68,8 +71,20 @@ public DynoQueueDAO(DiscoveryClient dc, Configuration config) {
 		DynoJedisClient dyno = new DynoJedisClient.Builder().withApplicationName(config.getAppId()).withDynomiteClusterName(cluster)
 				.withDiscoveryClient(dc).build();
 
+
+		this.dynoClientRead = new DynoJedisClient.Builder().withApplicationName(config.getAppId()).withDynomiteClusterName(cluster)
+				.withHostSupplier(new EurekaHostsSupplier(cluster, dc) {
+
+					@Override
+					public List<Host> getHosts() {
+						List<Host> hosts = super.getHosts();
+						hosts.forEach(host -> host.setPort(22122));
+						return hosts;
+					}
+
+				}).withPort(22122).withCPConfig(new ConnectionPoolConfigurationImpl(config.getAppId()+"read").setPort(22122)).build();
+
 		this.dynoClient = dyno;
-		this.dynoClientRead = dyno;
 
 		String region = config.getRegion();
 		String localDC = config.getAvailabilityZone();