Merge pull request #1920 from metamx/upgrade-curator

Update curator to 2.9.1
apache · Nov 6, 2015 · cf8b9a8 · cf8b9a8
2 parents 379ca87 + c896818
commit cf8b9a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -66,7 +66,7 @@
 
     <properties>
         <metamx.java-util.version>0.27.4</metamx.java-util.version>
-        <apache.curator.version>2.8.0</apache.curator.version>
+        <apache.curator.version>2.9.1</apache.curator.version>
         <jetty.version>9.2.5.v20141112</jetty.version>
         <jersey.version>1.19</jersey.version>
         <druid.api.version>0.3.13</druid.api.version>

diff --git a/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java
@@ -37,6 +37,7 @@
 import io.druid.server.DruidNode;
 import io.druid.server.initialization.CuratorDiscoveryConfig;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.utils.CloseableExecutorService;
 import org.apache.curator.x.discovery.DownInstancePolicy;
 import org.apache.curator.x.discovery.InstanceFilter;
 import org.apache.curator.x.discovery.ProviderStrategy;
@@ -55,6 +56,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadFactory;
 
 /**
@@ -323,6 +325,18 @@ public ServiceCacheBuilder<T> threadFactory(ThreadFactory threadFactory)
       return this;
     }
 
+    @Override
+    public ServiceCacheBuilder<T> executorService(ExecutorService executorService)
+    {
+      return this;
+    }
+
+    @Override
+    public ServiceCacheBuilder<T> executorService(CloseableExecutorService closeableExecutorService)
+    {
+      return this;
+    }
+
     private static class NoopServiceCache<T> implements ServiceCache<T>
     {
       @Override