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

curator 2.3.0

This commit is contained in:
Jae Hyeon Bae 2014-01-02 10:35:09 -08:00
parent 6c6c1c83f8
commit e4bcbcf3cc
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -40,7 +40,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<metamx.java-util.version>0.25.1</metamx.java-util.version> <metamx.java-util.version>0.25.1</metamx.java-util.version>
<apache.curator.version>2.1.0-incubating</apache.curator.version> <apache.curator.version>2.3.0</apache.curator.version>
<druid.api.version>0.1.7</druid.api.version> <druid.api.version>0.1.7</druid.api.version>
</properties> </properties>

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

@ -40,14 +40,7 @@ import io.druid.guice.annotations.Self;
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.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.*;
import org.apache.curator.x.discovery.ServiceCache;
import org.apache.curator.x.discovery.ServiceCacheBuilder;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.ServiceProvider;
import org.apache.curator.x.discovery.ServiceProviderBuilder;
import org.apache.curator.x.discovery.details.ServiceCacheListener; import org.apache.curator.x.discovery.details.ServiceCacheListener;
import java.io.IOException; import java.io.IOException;
@ -389,8 +382,12 @@ public class DiscoveryModule implements Module
} }
@Override @Override
public ServiceProviderBuilder<T> refreshPaddingMs(int refreshPaddingMs) public ServiceProviderBuilder<T> downInstancePolicy(DownInstancePolicy downInstancePolicy) {
{ return this;
}
@Override
public ServiceProviderBuilder<T> additionalFilter(InstanceFilter<T> tInstanceFilter) {
return this; return this;
} }
} }
@ -409,6 +406,11 @@ public class DiscoveryModule implements Module
return null; return null;
} }
@Override
public void noteError(ServiceInstance<T> tServiceInstance) {
}
@Override @Override
public void close() throws IOException public void close() throws IOException
{ {

5
server/src/main/java/io/druid/curator/discovery/ServerDiscoveryFactory.java
View File

@ -62,6 +62,11 @@ public class ServerDiscoveryFactory
return null; return null;
} }
@Override
public void noteError(ServiceInstance<T> tServiceInstance) {
// do nothing
}
@Override @Override
public void close() throws IOException public void close() throws IOException
{ {