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

partial changes

This commit is contained in:
Dhruv Parthasarathy 2013-07-23 17:25:36 -07:00
parent 86dd1a499c
commit 6dc8d09b00
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/main/java/com/metamx/druid/master/BalancerCostAnalyzer.java
View File

@ -183,17 +183,7 @@ public class BalancerCostAnalyzer
final Iterable<ServerHolder> serverHolders
)
{
MinMaxPriorityQueue<Pair<Double, ServerHolder>> costsAndServers = computeCosts(proposalSegment, serverHolders);
if (costsAndServers.isEmpty()) {
return null;
}
ServerHolder toServer = costsAndServers.pollFirst().rhs;
if (!toServer.isServingSegment(proposalSegment)) {
return toServer;
}
return null;
return computeCosts(proposalSegment, serverHolders).rhs;
}
/**
@ -220,11 +210,12 @@ public class BalancerCostAnalyzer
return null;
}
private MinMaxPriorityQueue<Pair<Double, ServerHolder>> computeCosts(
private Pair<Double, ServerHolder> computeCosts(
final DataSegment proposalSegment,
final Iterable<ServerHolder> serverHolders
)
{
Pair<Double,ServerHolder> bestServer = Pair.of(Double.POSITIVE_INFINITY,null);
MinMaxPriorityQueue<Pair<Double, ServerHolder>> costsAndServers = MinMaxPriorityQueue.orderedBy(
new Comparator<Pair<Double, ServerHolder>>()
{
@ -260,10 +251,12 @@ public class BalancerCostAnalyzer
cost += computeJointSegmentCosts(proposalSegment, segment);
}
costsAndServers.add(Pair.of(cost, server));
if (cost<bestServer.lhs && !server.isServingSegment(proposalSegment)){
bestServer= Pair.of(cost,server);
}
}
return costsAndServers;
return bestServer;
}
}