Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:metamx/druid

This commit is contained in:
fjy 2014-06-02 12:49:03 -07:00
parent abe26a7f2e 8c73ef648c
commit 6ddb014671
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indexing-service/src/main/java/io/druid/indexing/overlord/scaling/SimpleResourceManagementStrategy.java
View File

@ -323,14 +323,15 @@ public class SimpleResourceManagementStrategy implements ResourceManagementStrat
); );
} }
final boolean atSteadyState = currentlyProvisioning.isEmpty() final boolean notTakingActions = currentlyProvisioning.isEmpty()
&& currentlyTerminating.isEmpty() && currentlyTerminating.isEmpty();
&& validWorkers.size() == targetWorkerCount; final boolean shouldScaleUp = notTakingActions
final boolean shouldScaleUp = atSteadyState && validWorkers.size() >= targetWorkerCount
&& targetWorkerCount < maxWorkerCount && targetWorkerCount < maxWorkerCount
&& (hasTaskPendingBeyondThreshold(pendingTasks) && (hasTaskPendingBeyondThreshold(pendingTasks)
|| targetWorkerCount < minWorkerCount); || targetWorkerCount < minWorkerCount);
final boolean shouldScaleDown = atSteadyState final boolean shouldScaleDown = notTakingActions
&& validWorkers.size() == targetWorkerCount
&& targetWorkerCount > minWorkerCount && targetWorkerCount > minWorkerCount
&& Iterables.any(validWorkers, isLazyWorker); && Iterables.any(validWorkers, isLazyWorker);
if (shouldScaleUp) { if (shouldScaleUp) {