From 89eb2aff5a0094a018c4535d17caaaa1fb77c24e Mon Sep 17 00:00:00 2001 From: fjy Date: Sun, 12 May 2013 15:17:09 -0700 Subject: [PATCH 01/12] fix logging --- .../com/metamx/druid/merger/coordinator/RemoteTaskRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index f8d71836624..2542d825422 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -687,7 +687,7 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider ); if (workerQueue.isEmpty()) { - log.info("Worker nodes %s do not have capacity to run any more tasks!", zkWorkers.values()); + log.debug("Worker nodes %s do not have capacity to run any more tasks!", zkWorkers.values()); return null; } From 64febd47d76ead8350885aaa45317e0c4ba67ae1 Mon Sep 17 00:00:00 2001 From: fjy Date: Sun, 12 May 2013 15:19:12 -0700 Subject: [PATCH 02/12] [maven-release-plugin] prepare release druid-0.4.9 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index be24bb81ad4..ab402f80432 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/common/pom.xml b/common/pom.xml index b8757761ce2..6186e6a9ebe 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/examples/pom.xml b/examples/pom.xml index 8d82d054d1a..63593c11b0c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/index-common/pom.xml b/index-common/pom.xml index 4fccfbeaf0a..31bf2f10437 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/indexer/pom.xml b/indexer/pom.xml index dc2729cc48f..e264be90147 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/merger/pom.xml b/merger/pom.xml index 43e33f7e82b..e4d736b84c8 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/pom.xml b/pom.xml index 195e87473e0..f6744b5be8a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.9-SNAPSHOT + 0.4.9 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index de3cf71ae08..49b605e7181 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/server/pom.xml b/server/pom.xml index ad8b5253a19..02697d81082 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 diff --git a/services/pom.xml b/services/pom.xml index b4cf8354c54..24ed287cc71 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.9-SNAPSHOT + 0.4.9 com.metamx druid - 0.4.9-SNAPSHOT + 0.4.9 From 219a8d7d05256cdeb045083c694871603533cf2a Mon Sep 17 00:00:00 2001 From: fjy Date: Sun, 12 May 2013 15:19:19 -0700 Subject: [PATCH 03/12] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index ab402f80432..488534c7e9b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 6186e6a9ebe..08a3134addf 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 63593c11b0c..96b24ad1c8c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 31bf2f10437..c27f6b7c1ca 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index e264be90147..2dc8a7e9f10 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index e4d736b84c8..c359719ddc6 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/pom.xml b/pom.xml index f6744b5be8a..98f73fd5a05 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.9 + 0.4.10-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 49b605e7181..7877aac9f71 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 02697d81082..514059b3fc6 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 24ed287cc71..1a7126c6210 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.9 + 0.4.10-SNAPSHOT com.metamx druid - 0.4.9 + 0.4.10-SNAPSHOT From 9ab22f238e32d0a1bbd0613749a8bf6c5e08c3ca Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 11:06:46 -0700 Subject: [PATCH 04/12] fix bug in RTR for not correctly exiting after timeout --- .../merger/coordinator/RemoteTaskRunner.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index 2542d825422..fe0577a8c77 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -230,6 +230,13 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider return null; } + public boolean isWorkerRunningTask(String workerHost, String taskId) + { + ZkWorker zkWorker = zkWorkers.get(workerHost); + + return (zkWorker != null && zkWorker.getRunningTasks().contains(taskId)); + } + /** * A task will be run only if there is no current knowledge in the RemoteTaskRunner of the task. * @@ -350,6 +357,7 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider /** * Adds a task to the pending queue + * * @param taskRunnerWorkItem */ private void addPendingTask(final TaskRunnerWorkItem taskRunnerWorkItem) @@ -506,8 +514,18 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider // Syncing state with Zookeeper - don't assign new tasks until the task we just assigned is actually running // on a worker - this avoids overflowing a worker with tasks synchronized (statusLock) { - while (findWorkerRunningTask(task.getId()) == null) { + while (!isWorkerRunningTask(theWorker.getHost(), task.getId())) { statusLock.wait(config.getTaskAssignmentTimeoutDuration().getMillis()); + if (!isWorkerRunningTask(theWorker.getHost(), task.getId())) { + log.error( + "Something went wrong! %s never ran task %s after %s!", + theWorker.getHost(), + task.getId(), + config.getTaskAssignmentTimeoutDuration() + ); + retryTask(runningTasks.get(task.getId()), theWorker.getHost()); + break; + } } } } From 1860104abe686b0edf1ba5b2cb33fe7a63c28ffe Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 11:08:29 -0700 Subject: [PATCH 05/12] [maven-release-plugin] prepare release druid-0.4.10 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 488534c7e9b..6bd0b1693c7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/common/pom.xml b/common/pom.xml index 08a3134addf..6a9ddf1c915 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/examples/pom.xml b/examples/pom.xml index 96b24ad1c8c..34e38e481a5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/index-common/pom.xml b/index-common/pom.xml index c27f6b7c1ca..f67f941af27 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/indexer/pom.xml b/indexer/pom.xml index 2dc8a7e9f10..edecf29bc3f 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/merger/pom.xml b/merger/pom.xml index c359719ddc6..fe1aa8e260f 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/pom.xml b/pom.xml index 98f73fd5a05..be7b8a0f512 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.10-SNAPSHOT + 0.4.10 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 7877aac9f71..eef4e472ae0 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/server/pom.xml b/server/pom.xml index 514059b3fc6..72aa9111551 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 diff --git a/services/pom.xml b/services/pom.xml index 1a7126c6210..215f4e7943a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.10-SNAPSHOT + 0.4.10 com.metamx druid - 0.4.10-SNAPSHOT + 0.4.10 From 82c4cd5641c9fd24184c7e6e5bfb56e5f0879fd3 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 11:08:39 -0700 Subject: [PATCH 06/12] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 6bd0b1693c7..2d782de0e3c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 6a9ddf1c915..211f9a60417 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 34e38e481a5..ec19731c69a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index f67f941af27..f9bcc6e8b4c 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index edecf29bc3f..44b7ce8fd3f 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index fe1aa8e260f..ca9ed3b6df9 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/pom.xml b/pom.xml index be7b8a0f512..a944656a2d3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.10 + 0.4.11-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index eef4e472ae0..d3a4eb9c523 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 72aa9111551..1891ada95a5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 215f4e7943a..a44380a2534 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.10 + 0.4.11-SNAPSHOT com.metamx druid - 0.4.10 + 0.4.11-SNAPSHOT From 53c3af6633fd40cdb2aa039d3e29541031fecf2d Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 12:37:21 -0700 Subject: [PATCH 07/12] actually fix the bug mentioned in the last commit --- .../metamx/druid/merger/coordinator/RemoteTaskRunner.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index fe0577a8c77..9c21ce43d6f 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -25,6 +25,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; +import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.MinMaxPriorityQueue; @@ -513,10 +514,12 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider // Syncing state with Zookeeper - don't assign new tasks until the task we just assigned is actually running // on a worker - this avoids overflowing a worker with tasks + Stopwatch timeoutStopwatch = new Stopwatch(); + timeoutStopwatch.start(); synchronized (statusLock) { while (!isWorkerRunningTask(theWorker.getHost(), task.getId())) { statusLock.wait(config.getTaskAssignmentTimeoutDuration().getMillis()); - if (!isWorkerRunningTask(theWorker.getHost(), task.getId())) { + if (timeoutStopwatch.elapsedMillis() >= config.getTaskAssignmentTimeoutDuration().getMillis()) { log.error( "Something went wrong! %s never ran task %s after %s!", theWorker.getHost(), From 57e1cf5f1d9b036a89f5457f90f7657ec333f5a5 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 12:39:01 -0700 Subject: [PATCH 08/12] [maven-release-plugin] prepare release druid-0.4.11 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 2d782de0e3c..f13e5ea7537 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/common/pom.xml b/common/pom.xml index 211f9a60417..8911cf572c9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/examples/pom.xml b/examples/pom.xml index ec19731c69a..7ce34e5367d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/index-common/pom.xml b/index-common/pom.xml index f9bcc6e8b4c..f9d3b8ee858 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/indexer/pom.xml b/indexer/pom.xml index 44b7ce8fd3f..3dff0711148 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/merger/pom.xml b/merger/pom.xml index ca9ed3b6df9..aa23a30334f 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/pom.xml b/pom.xml index a944656a2d3..3ae091fab43 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.11-SNAPSHOT + 0.4.11 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index d3a4eb9c523..25e5c44c793 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/server/pom.xml b/server/pom.xml index 1891ada95a5..0bc400b69b1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 diff --git a/services/pom.xml b/services/pom.xml index a44380a2534..cca9dd8fd90 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.11-SNAPSHOT + 0.4.11 com.metamx druid - 0.4.11-SNAPSHOT + 0.4.11 From 2c45f3349751063ac564909ec5092ff161299bff Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 12:39:09 -0700 Subject: [PATCH 09/12] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index f13e5ea7537..f137c566e3e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 8911cf572c9..023a382d648 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 7ce34e5367d..f9f4bd85d63 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index f9d3b8ee858..133fed0e613 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 3dff0711148..66f86ca9ef5 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index aa23a30334f..44b9d4fa8bc 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3ae091fab43..ff5f6184ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.11 + 0.4.12-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 25e5c44c793..147d71859b6 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 0bc400b69b1..a1447db0c1a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index cca9dd8fd90..88c0d0fce88 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.11 + 0.4.12-SNAPSHOT com.metamx druid - 0.4.11 + 0.4.12-SNAPSHOT From 5c9df858831f5ada748b5001320b4b334a938ec6 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 15:21:45 -0700 Subject: [PATCH 10/12] better path validation --- .../merger/coordinator/RemoteTaskRunner.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index 9c21ce43d6f..47f53097022 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -498,16 +498,15 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider throw new ISE("Length of raw bytes for task too large[%,d > %,d]", rawBytes.length, config.getMaxNumBytes()); } - cf.create() - .withMode(CreateMode.EPHEMERAL) - .forPath( - JOINER.join( - config.getIndexerTaskPath(), - theWorker.getHost(), - task.getId() - ), - rawBytes - ); + String taskPath = JOINER.join(config.getIndexerTaskPath(), theWorker.getHost(), task.getId()); + + if (cf.checkExists().forPath(taskPath) == null) { + cf.create() + .withMode(CreateMode.EPHEMERAL) + .forPath( + taskPath, rawBytes + ); + } runningTasks.put(task.getId(), pendingTasks.remove(task.getId())); log.info("Task %s switched from pending to running", task.getId()); From d8d7d92f6588f38c2c2821ffef184ebc6d81b733 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 17:31:02 -0700 Subject: [PATCH 11/12] [maven-release-plugin] prepare release druid-0.4.12 --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index f137c566e3e..15d329f6ba8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/common/pom.xml b/common/pom.xml index 023a382d648..0b42cb2fe99 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/examples/pom.xml b/examples/pom.xml index f9f4bd85d63..fdbd49eb7c1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/index-common/pom.xml b/index-common/pom.xml index 133fed0e613..9edd97d03c3 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/indexer/pom.xml b/indexer/pom.xml index 66f86ca9ef5..274c977340a 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/merger/pom.xml b/merger/pom.xml index 44b9d4fa8bc..55611b2ffda 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/pom.xml b/pom.xml index ff5f6184ca6..f393e18cf46 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.12-SNAPSHOT + 0.4.12 druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 147d71859b6..9d9cec1fba6 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/server/pom.xml b/server/pom.xml index a1447db0c1a..7445bfb9593 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 diff --git a/services/pom.xml b/services/pom.xml index 88c0d0fce88..90b91644556 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.12-SNAPSHOT + 0.4.12 com.metamx druid - 0.4.12-SNAPSHOT + 0.4.12 From 7d34710edf8196d9e3a843e99c9ea09154b05858 Mon Sep 17 00:00:00 2001 From: fjy Date: Mon, 13 May 2013 17:31:11 -0700 Subject: [PATCH 12/12] [maven-release-plugin] prepare for next development iteration --- client/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- index-common/pom.xml | 2 +- indexer/pom.xml | 2 +- merger/pom.xml | 2 +- pom.xml | 2 +- realtime/pom.xml | 2 +- server/pom.xml | 2 +- services/pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 15d329f6ba8..93dad68d81f 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 0b42cb2fe99..9758c0822df 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index fdbd49eb7c1..cb3070afda0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -9,7 +9,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/index-common/pom.xml b/index-common/pom.xml index 9edd97d03c3..a0723e20af0 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/indexer/pom.xml b/indexer/pom.xml index 274c977340a..546a7eb21ff 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/merger/pom.xml b/merger/pom.xml index 55611b2ffda..fcbd7f29f3e 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/pom.xml b/pom.xml index f393e18cf46..00b7f403c1c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.metamx druid pom - 0.4.12 + 0.4.13-SNAPSHOT druid druid diff --git a/realtime/pom.xml b/realtime/pom.xml index 9d9cec1fba6..c12f4bd0d84 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/server/pom.xml b/server/pom.xml index 7445bfb9593..194991b7c56 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -28,7 +28,7 @@ com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 90b91644556..0c2c9d7dc66 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -24,11 +24,11 @@ druid-services druid-services druid-services - 0.4.12 + 0.4.13-SNAPSHOT com.metamx druid - 0.4.12 + 0.4.13-SNAPSHOT