From d9f2e68f7fadf8b0e2bae378b2a2ed726eae20ea Mon Sep 17 00:00:00 2001
From: Fangjin Yang <fangjin@metamarketsgroup.com>
Date: Fri, 1 Feb 2013 17:16:24 -0800
Subject: [PATCH] better logs

---
 .../com/metamx/druid/merger/coordinator/RemoteTaskRunner.java | 2 +-
 .../merger/coordinator/scaling/EC2AutoScalingStrategy.java    | 4 ++++
 2 files changed, 5 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 1bead5a3346..32acc66ae43 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
@@ -563,7 +563,7 @@ public class RemoteTaskRunner implements TaskRunner
       );
 
       if (workerQueue.isEmpty()) {
-        log.info("Worker nodes do not have capacity to run any more tasks!");
+        log.info("Worker nodes %s do not have capacity to run any more tasks!", zkWorkers.values());
 
         if (currentlyProvisioning.isEmpty()) {
           AutoScalingData provisioned = strategy.provision();
diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/EC2AutoScalingStrategy.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/EC2AutoScalingStrategy.java
index 8d51da61afd..2a50a8b55fd 100644
--- a/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/EC2AutoScalingStrategy.java
+++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/EC2AutoScalingStrategy.java
@@ -130,6 +130,10 @@ public class EC2AutoScalingStrategy implements ScalingStrategy<Instance>
   @Override
   public AutoScalingData<Instance> terminate(List<String> ids)
   {
+    if (ids.isEmpty()) {
+      return new AutoScalingData<Instance>(Lists.<String>newArrayList(), Lists.<Instance>newArrayList());
+    }
+
     DescribeInstancesResult result = amazonEC2Client.describeInstances(
         new DescribeInstancesRequest()
             .withFilters(