Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1920 from metamx/upgrade-curator 

Update curator to 2.9.1
This commit is contained in:
Charles Allen 2015-11-06 09:25:27 -08:00
parent 379ca87e6a c896818241
commit cf8b9a8613
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -66,7 +66,7 @@
<properties> <properties>
<metamx.java-util.version>0.27.4</metamx.java-util.version> <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> <jetty.version>9.2.5.v20141112</jetty.version>
<jersey.version>1.19</jersey.version> <jersey.version>1.19</jersey.version>
<druid.api.version>0.3.13</druid.api.version> <druid.api.version>0.3.13</druid.api.version>

14
server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java
View File

@ -37,6 +37,7 @@ import io.druid.guice.LifecycleModule;
import io.druid.server.DruidNode; import io.druid.server.DruidNode;
import io.druid.server.initialization.CuratorDiscoveryConfig; import io.druid.server.initialization.CuratorDiscoveryConfig;
import org.apache.curator.framework.CuratorFramework; 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.DownInstancePolicy;
import org.apache.curator.x.discovery.InstanceFilter; import org.apache.curator.x.discovery.InstanceFilter;
import org.apache.curator.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.ProviderStrategy;
@ -55,6 +56,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
/** /**
@ -323,6 +325,18 @@ public class DiscoveryModule implements Module
return this; 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> private static class NoopServiceCache<T> implements ServiceCache<T>
{ {
@Override @Override