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 68f8f9b505d650a3e65b1e5a71772213d058eff0..d13435de8a58b8a1baa2f39fe819474f898b0010 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 a20e324ed1e13b31c67e9284218d96b2434af227..3c65cc9137b72ee9b33b6f3f5f6207019b8c810c 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 getRunningTasks() { Map 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 7018e37a7f4f827781d7f0a2deaf198d3f074dcd..2acadd3ae838a399fe3fda9fc0e86e98e1546778 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 5422a21773a72ebd5c3551c3f143b05853a2bdd8..45b5573674a3b207c5c3139f73d2f1a0e3787927 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 } ); - 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 } ); - 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 4451d68ff76f7961ae342414720795e437dd08c5..2546d7e770909ad31c619756cd44d837a9607937 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 pendingTasks, Collection 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()