From 626cf14a6e42fa0a2d144e8e16940e09bafd754a Mon Sep 17 00:00:00 2001
From: fjy <fangjin@metamarkets.com>
Date: Mon, 5 Aug 2013 16:02:26 -0700
Subject: [PATCH] fix bug where the curator config name was changed in one
 place but not another; make some info msgs into debug msgs; fix zkworker
 serialization

---
 .../druid/indexing/coordinator/RemoteTaskRunner.java   |  2 +-
 .../metamx/druid/indexing/coordinator/ZkWorker.java    | 10 +++++-----
 .../coordinator/config/RemoteTaskRunnerConfig.java     |  2 +-
 .../coordinator/scaling/EC2AutoScalingStrategy.java    |  4 ++--
 .../scaling/SimpleResourceManagementStrategy.java      |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
index 68f8f9b505..d13435de8a 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
@@ -685,7 +685,7 @@ public class RemoteTaskRunner implements TaskRunner, TaskLogProvider
               ZkWorker zkWorker, ZkWorker zkWorker2
           )
           {
-            return -Ints.compare(zkWorker.getCurrCapacity(), zkWorker2.getCurrCapacity());
+            return -Ints.compare(zkWorker.getCurrCapacityUsed(), zkWorker2.getCurrCapacityUsed());
           }
         }
     );
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ZkWorker.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ZkWorker.java
index a20e324ed1..3c65cc9137 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ZkWorker.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ZkWorker.java
@@ -85,7 +85,7 @@ public class ZkWorker implements Closeable
     return worker;
   }
 
-  @JsonProperty
+  @JsonProperty("runningTasks")
   public Map<String, TaskStatus> getRunningTasks()
   {
     Map<String, TaskStatus> retVal = Maps.newHashMap();
@@ -99,8 +99,8 @@ public class ZkWorker implements Closeable
     return retVal;
   }
 
-  @JsonProperty("currCapacity")
-  public int getCurrCapacity()
+  @JsonProperty("currCapacityUsed")
+  public int getCurrCapacityUsed()
   {
     int currCapacity = 0;
     for (TaskStatus taskStatus : getRunningTasks().values()) {
@@ -132,12 +132,12 @@ public class ZkWorker implements Closeable
 
   public boolean isAtCapacity()
   {
-    return getCurrCapacity() >= worker.getCapacity();
+    return getCurrCapacityUsed() >= worker.getCapacity();
   }
 
   public boolean canRunTask(Task task)
   {
-    return (worker.getCapacity() - getCurrCapacity() >= task.getTaskResource().getRequiredCapacity()
+    return (worker.getCapacity() - getCurrCapacityUsed() >= task.getTaskResource().getRequiredCapacity()
             && !getAvailabilityGroups().contains(task.getTaskResource().getAvailabilityGroup()));
   }
 
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/RemoteTaskRunnerConfig.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/RemoteTaskRunnerConfig.java
index 7018e37a7f..2acadd3ae8 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/RemoteTaskRunnerConfig.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/config/RemoteTaskRunnerConfig.java
@@ -33,7 +33,7 @@ public abstract class RemoteTaskRunnerConfig extends IndexerZkConfig
   @Default("PT5M")
   public abstract Duration getTaskAssignmentTimeoutDuration();
 
-  @Config("druid.curator.compression.enable")
+  @Config("druid.curator.compress")
   @Default("false")
   public abstract boolean enableCompression();
 
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategy.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategy.java
index 5422a21773..45b5573674 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategy.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/EC2AutoScalingStrategy.java
@@ -218,7 +218,7 @@ public class EC2AutoScalingStrategy implements AutoScalingStrategy<Instance>
         }
     );
 
-    log.info("Performing lookup: %s --> %s", ips, retVal);
+    log.debug("Performing lookup: %s --> %s", ips, retVal);
 
     return retVal;
   }
@@ -250,7 +250,7 @@ public class EC2AutoScalingStrategy implements AutoScalingStrategy<Instance>
         }
     );
 
-    log.info("Performing lookup: %s --> %s", nodeIds, retVal);
+    log.debug("Performing lookup: %s --> %s", nodeIds, retVal);
 
     return retVal;
   }
diff --git a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategy.java b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategy.java
index 4451d68ff7..2546d7e770 100644
--- a/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategy.java
+++ b/indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/scaling/SimpleResourceManagementStrategy.java
@@ -72,7 +72,7 @@ public class SimpleResourceManagementStrategy implements ResourceManagementStrat
   public boolean doProvision(Collection<RemoteTaskRunnerWorkItem> pendingTasks, Collection<ZkWorker> zkWorkers)
   {
     if (zkWorkers.size() >= workerSetupdDataRef.get().getMaxNumWorkers()) {
-      log.info(
+      log.debug(
           "Cannot scale anymore. Num workers = %d, Max num workers = %d",
           zkWorkers.size(),
           workerSetupdDataRef.get().getMaxNumWorkers()
-- 
GitLab