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

Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x

This commit is contained in:
fjy 2014-09-26 11:39:50 -07:00
parent eaf0a48b92 323153a59f
commit 4244accab5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/io/druid/client/CachingClusteredClient.java
View File

@ -321,7 +321,7 @@ public class CachingClusteredClient<T> implements QueryRunner<T>
final QueryRunner clientQueryable = serverView.getQueryRunner(server); final QueryRunner clientQueryable = serverView.getQueryRunner(server);
if (clientQueryable == null) { if (clientQueryable == null) {
log.makeAlert("WTF!? server[%s] doesn't have a client Queryable?", server).emit(); log.error("WTF!? server[%s] doesn't have a client Queryable?", server);
continue; continue;
} }

2
server/src/main/java/io/druid/client/DirectDruidClient.java
View File

@ -343,7 +343,7 @@ public class DirectDruidClient<T> implements QueryRunner<T>
} }
} }
catch (IOException | InterruptedException | ExecutionException e) { catch (IOException | InterruptedException | ExecutionException e) {
throw new RE(e, "Failure getting results from[%s]", url); throw new RE(e, "Failure getting results from[%s] because of [%s]", url, e.getMessage());
} }
catch (CancellationException e) { catch (CancellationException e) {
throw new QueryInterruptedException("Query cancelled"); throw new QueryInterruptedException("Query cancelled");

2
server/src/main/java/io/druid/curator/CuratorConfig.java
View File

@ -34,6 +34,6 @@ public abstract class CuratorConfig
public abstract int getZkSessionTimeoutMs(); public abstract int getZkSessionTimeoutMs();
@Config("druid.curator.compress") @Config("druid.curator.compress")
@Default("false") @Default("true")
public abstract boolean enableCompression(); public abstract boolean enableCompression();
} }

2
server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java
View File

@ -25,7 +25,7 @@ import com.google.inject.Provider;
/** /**
*/ */
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LegacyDataSegmentAnnouncerProvider.class) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = BatchDataSegmentAnnouncerProvider.class)
@JsonSubTypes(value = { @JsonSubTypes(value = {
@JsonSubTypes.Type(name = "legacy", value = LegacyDataSegmentAnnouncerProvider.class), @JsonSubTypes.Type(name = "legacy", value = LegacyDataSegmentAnnouncerProvider.class),
@JsonSubTypes.Type(name = "batch", value = BatchDataSegmentAnnouncerProvider.class) @JsonSubTypes.Type(name = "batch", value = BatchDataSegmentAnnouncerProvider.class)

2
services/src/main/java/io/druid/cli/CliBridge.java
View File

@ -71,7 +71,7 @@ public class CliBridge extends ServerRunnable
public void configure(Binder binder) public void configure(Binder binder)
{ {
binder.bindConstant().annotatedWith(Names.named("serviceName")).to("druid/bridge"); binder.bindConstant().annotatedWith(Names.named("serviceName")).to("druid/bridge");
binder.bindConstant().annotatedWith(Names.named("servicePort")).to(8081); binder.bindConstant().annotatedWith(Names.named("servicePort")).to(8089);
ConfigProvider.bind(binder, BridgeCuratorConfig.class); ConfigProvider.bind(binder, BridgeCuratorConfig.class);