From e62ed40d869854e9425c8ef3c1f7b9a7427a8ad4 Mon Sep 17 00:00:00 2001 From: fjy Date: Thu, 11 Sep 2014 16:49:18 -0700 Subject: [PATCH 1/7] make some logs not emit --- .../src/main/java/io/druid/client/CachingClusteredClient.java | 2 +- server/src/main/java/io/druid/client/DirectDruidClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/io/druid/client/CachingClusteredClient.java b/server/src/main/java/io/druid/client/CachingClusteredClient.java index 0a44e41f768..ba3b49f25d2 100644 --- a/server/src/main/java/io/druid/client/CachingClusteredClient.java +++ b/server/src/main/java/io/druid/client/CachingClusteredClient.java @@ -321,7 +321,7 @@ public class CachingClusteredClient implements QueryRunner final QueryRunner clientQueryable = serverView.getQueryRunner(server); 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; } diff --git a/server/src/main/java/io/druid/client/DirectDruidClient.java b/server/src/main/java/io/druid/client/DirectDruidClient.java index a2fde2c1033..45f40133096 100644 --- a/server/src/main/java/io/druid/client/DirectDruidClient.java +++ b/server/src/main/java/io/druid/client/DirectDruidClient.java @@ -343,7 +343,7 @@ public class DirectDruidClient implements QueryRunner } } catch (IOException | InterruptedException | ExecutionException e) { - throw new RE(e, "Failure getting results from[%s]", url); + log.error(e, "Failure getting results from[%s]. Likely a timeout occurred.", url); } catch (CancellationException e) { throw new QueryInterruptedException("Query cancelled"); From cbf50769618733805b86eb5ea82fc3459b857bda Mon Sep 17 00:00:00 2001 From: fjy Date: Fri, 12 Sep 2014 11:43:42 -0700 Subject: [PATCH 2/7] still propagate log --- server/src/main/java/io/druid/client/DirectDruidClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/io/druid/client/DirectDruidClient.java b/server/src/main/java/io/druid/client/DirectDruidClient.java index 45f40133096..2e0e22ce48a 100644 --- a/server/src/main/java/io/druid/client/DirectDruidClient.java +++ b/server/src/main/java/io/druid/client/DirectDruidClient.java @@ -343,7 +343,7 @@ public class DirectDruidClient implements QueryRunner } } catch (IOException | InterruptedException | ExecutionException e) { - log.error(e, "Failure getting results from[%s]. Likely a timeout occurred.", url); + throw new RE(e, "Failure getting results from[%s]. Likely a timeout occurred.", url); } catch (CancellationException e) { throw new QueryInterruptedException("Query cancelled"); From 1615e1ac63fcb21ad9561efd8f6d723c49a177ce Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 15 Sep 2014 12:43:35 -0700 Subject: [PATCH 3/7] update druid api ver --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d227fcbf4c..898e28a3448 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 0.26.6 2.6.0 - 0.2.8 + 0.2.9 From aa28bc06130a5cfb595425efb87727d59df098e0 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 15 Sep 2014 13:14:23 -0700 Subject: [PATCH 4/7] address cr --- server/src/main/java/io/druid/client/DirectDruidClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/io/druid/client/DirectDruidClient.java b/server/src/main/java/io/druid/client/DirectDruidClient.java index 2e0e22ce48a..c354bc18259 100644 --- a/server/src/main/java/io/druid/client/DirectDruidClient.java +++ b/server/src/main/java/io/druid/client/DirectDruidClient.java @@ -343,7 +343,7 @@ public class DirectDruidClient implements QueryRunner } } catch (IOException | InterruptedException | ExecutionException e) { - throw new RE(e, "Failure getting results from[%s]. Likely a timeout occurred.", url); + throw new RE(e, "Failure getting results from[%s] because of [%s]", url, e.getMessage()); } catch (CancellationException e) { throw new QueryInterruptedException("Query cancelled"); From 0209b7e44013c785bb6a7ed3e1c4bf6c842cb918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 15 Sep 2014 15:56:35 -0700 Subject: [PATCH 5/7] fix bridge port --- services/src/main/java/io/druid/cli/CliBridge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/main/java/io/druid/cli/CliBridge.java b/services/src/main/java/io/druid/cli/CliBridge.java index 6da1ec21c38..a1f893f968e 100644 --- a/services/src/main/java/io/druid/cli/CliBridge.java +++ b/services/src/main/java/io/druid/cli/CliBridge.java @@ -71,7 +71,7 @@ public class CliBridge extends ServerRunnable public void configure(Binder binder) { 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); From d9a0d403b3b4ec655d4f39b1fc28d302d38b937d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 16 Sep 2014 14:53:54 -0700 Subject: [PATCH 6/7] default zk compressed + batch announcements in 0.7 --- server/src/main/java/io/druid/curator/CuratorConfig.java | 2 +- .../druid/server/coordination/DataSegmentAnnouncerProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/io/druid/curator/CuratorConfig.java b/server/src/main/java/io/druid/curator/CuratorConfig.java index 7ac0247b342..50d23f64104 100644 --- a/server/src/main/java/io/druid/curator/CuratorConfig.java +++ b/server/src/main/java/io/druid/curator/CuratorConfig.java @@ -34,6 +34,6 @@ public abstract class CuratorConfig public abstract int getZkSessionTimeoutMs(); @Config("druid.curator.compress") - @Default("false") + @Default("true") public abstract boolean enableCompression(); } diff --git a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java b/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java index eeed92b045a..eb52deb13bd 100644 --- a/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java +++ b/server/src/main/java/io/druid/server/coordination/DataSegmentAnnouncerProvider.java @@ -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.Type(name = "legacy", value = LegacyDataSegmentAnnouncerProvider.class), @JsonSubTypes.Type(name = "batch", value = BatchDataSegmentAnnouncerProvider.class) From b38a9bc1c1fe114b304d6e1db0d976a1be46cbcc Mon Sep 17 00:00:00 2001 From: nishantmonu51 Date: Mon, 22 Sep 2014 22:15:00 +0530 Subject: [PATCH 7/7] upgrade druid-api --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 898e28a3448..639cb99ceec 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 0.26.6 2.6.0 - 0.2.9 + 0.2.10