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

replace param BalancerCostAnalyzer getter with a factory

This commit is contained in:
Nelson Ray 2013-01-21 15:32:29 -08:00
parent 2d7113b263
commit 94b72e8878
6 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/metamx/druid/master/DruidMaster.java
View File

@ -671,7 +671,7 @@ public class DruidMaster
.withDruidCluster(cluster)
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(segmentReplicantLookup)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(DateTime.now()))
.withBalancerReferenceTimestamp(DateTime.now())
.build();
}
},

4
server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java
View File

@ -26,6 +26,7 @@ import com.metamx.common.guava.Comparators;
import com.metamx.druid.client.DataSegment;
import com.metamx.druid.client.DruidServer;
import com.metamx.emitter.EmittingLogger;
import org.joda.time.DateTime;
import java.util.ArrayList;
import java.util.Comparator;
@ -82,7 +83,8 @@ public class DruidMasterBalancer implements DruidMasterHelper
public DruidMasterRuntimeParams run(DruidMasterRuntimeParams params)
{
final MasterStats stats = new MasterStats();
final BalancerCostAnalyzer analyzer = params.getBalancerCostAnalyzer();
final DateTime referenceTimestamp = params.getBalancerReferenceTimestamp();
final BalancerCostAnalyzer analyzer = params.getBalancerCostAnalyzer(referenceTimestamp);
final int maxSegmentsToMove = params.getMaxSegmentsToMove();
for (Map.Entry<String, MinMaxPriorityQueue<ServerHolder>> entry :

32
server/src/main/java/com/metamx/druid/master/DruidMasterRuntimeParams.java
View File

@ -27,6 +27,7 @@ import com.metamx.druid.client.DruidDataSource;
import com.metamx.druid.db.DatabaseRuleManager;
import com.metamx.druid.master.rules.RuleMap;
import com.metamx.emitter.service.ServiceEmitter;
import org.joda.time.DateTime;
import java.util.Collection;
import java.util.Collections;
@ -50,7 +51,7 @@ public class DruidMasterRuntimeParams
private final long mergeBytesLimit;
private final int mergeSegmentsLimit;
private final int maxSegmentsToMove;
private final BalancerCostAnalyzer balancerCostAnalyzer;
private final DateTime balancerReferenceTimestamp;
public DruidMasterRuntimeParams(
long startTime,
@ -66,7 +67,7 @@ public class DruidMasterRuntimeParams
long mergeBytesLimit,
int mergeSegmentsLimit,
int maxSegmentsToMove,
BalancerCostAnalyzer balancerCostAnalyzer
DateTime balancerReferenceTimestamp
)
{
this.startTime = startTime;
@ -82,7 +83,7 @@ public class DruidMasterRuntimeParams
this.mergeBytesLimit = mergeBytesLimit;
this.mergeSegmentsLimit = mergeSegmentsLimit;
this.maxSegmentsToMove = maxSegmentsToMove;
this.balancerCostAnalyzer = balancerCostAnalyzer;
this.balancerReferenceTimestamp = balancerReferenceTimestamp;
}
public long getStartTime()
@ -150,9 +151,14 @@ public class DruidMasterRuntimeParams
return maxSegmentsToMove;
}
public BalancerCostAnalyzer getBalancerCostAnalyzer()
public DateTime getBalancerReferenceTimestamp()
{
return balancerCostAnalyzer;
return balancerReferenceTimestamp;
}
public BalancerCostAnalyzer getBalancerCostAnalyzer(DateTime referenceTimestamp)
{
return new BalancerCostAnalyzer(referenceTimestamp);
}
public boolean hasDeletionWaitTimeElapsed()
@ -181,7 +187,7 @@ public class DruidMasterRuntimeParams
mergeBytesLimit,
mergeSegmentsLimit,
maxSegmentsToMove,
balancerCostAnalyzer
balancerReferenceTimestamp
);
}
@ -200,7 +206,7 @@ public class DruidMasterRuntimeParams
private long mergeBytesLimit;
private int mergeSegmentsLimit;
private int maxSegmentsToMove;
private BalancerCostAnalyzer balancerCostAnalyzer;
private DateTime balancerReferenceTimestamp;
Builder()
{
@ -217,7 +223,7 @@ public class DruidMasterRuntimeParams
this.mergeBytesLimit = 0;
this.mergeSegmentsLimit = 0;
this.maxSegmentsToMove = 0;
this.balancerCostAnalyzer = null;
this.balancerReferenceTimestamp = null;
}
Builder(
@ -234,7 +240,7 @@ public class DruidMasterRuntimeParams
long mergeBytesLimit,
int mergeSegmentsLimit,
int maxSegmentsToMove,
BalancerCostAnalyzer balancerCostAnalyzer
DateTime balancerReferenceTimestamp
)
{
this.startTime = startTime;
@ -250,7 +256,7 @@ public class DruidMasterRuntimeParams
this.mergeBytesLimit = mergeBytesLimit;
this.mergeSegmentsLimit = mergeSegmentsLimit;
this.maxSegmentsToMove = maxSegmentsToMove;
this.balancerCostAnalyzer = balancerCostAnalyzer;
this.balancerReferenceTimestamp = balancerReferenceTimestamp;
}
public DruidMasterRuntimeParams build()
@ -269,7 +275,7 @@ public class DruidMasterRuntimeParams
mergeBytesLimit,
mergeSegmentsLimit,
maxSegmentsToMove,
balancerCostAnalyzer
balancerReferenceTimestamp
);
}
@ -351,9 +357,9 @@ public class DruidMasterRuntimeParams
return this;
}
public Builder withBalancerCostAnalyzer(BalancerCostAnalyzer balancerCostAnalyzer)
public Builder withBalancerReferenceTimestamp(DateTime balancerReferenceTimestamp)
{
this.balancerCostAnalyzer = balancerCostAnalyzer;
this.balancerReferenceTimestamp = balancerReferenceTimestamp;
return this;
}
}

4
server/src/main/java/com/metamx/druid/master/rules/LoadRule.java
View File

@ -31,6 +31,7 @@ import com.metamx.druid.master.LoadPeonCallback;
import com.metamx.druid.master.MasterStats;
import com.metamx.druid.master.ServerHolder;
import com.metamx.emitter.EmittingLogger;
import org.joda.time.DateTime;
import java.util.ArrayList;
import java.util.List;
@ -86,7 +87,8 @@ public abstract class LoadRule implements Rule
List<ServerHolder> assignedServers = Lists.newArrayList();
while (totalReplicants < expectedReplicants) {
BalancerCostAnalyzer analyzer = params.getBalancerCostAnalyzer();
final DateTime referenceTimestamp = params.getBalancerReferenceTimestamp();
final BalancerCostAnalyzer analyzer = params.getBalancerCostAnalyzer(referenceTimestamp);
ServerHolder holder = analyzer.findNewSegmentHome(segment, serverHolderList);
if (holder == null) {

4
server/src/test/java/com/metamx/druid/master/DruidMasterBalancerTest.java
View File

@ -224,7 +224,7 @@ public class DruidMasterBalancerTest
.withLoadManagementPeons(ImmutableMap.of("from", peon, "to", peon))
.withAvailableSegments(segments.values())
.withMaxSegmentsToMove(MAX_SEGMENTS_TO_MOVE)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
params = new DruidMasterBalancer(master).run(params);
@ -373,7 +373,7 @@ public class DruidMasterBalancerTest
.withLoadManagementPeons(ImmutableMap.of("1", peon, "2", peon, "3", peon, "4", peon))
.withAvailableSegments(segments.values())
.withMaxSegmentsToMove(MAX_SEGMENTS_TO_MOVE)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
params = new DruidMasterBalancer(master).run(params);

12
server/src/test/java/com/metamx/druid/master/DruidMasterRuleRunnerTest.java
View File

@ -176,7 +176,7 @@ public class DruidMasterRuleRunnerTest
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(SegmentReplicantLookup.make(new DruidCluster()))
.withMaxSegmentsToMove(5)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
DruidMasterRuntimeParams afterParams = ruleRunner.run(params);
@ -266,7 +266,7 @@ public class DruidMasterRuleRunnerTest
.withAvailableSegments(availableSegments)
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(SegmentReplicantLookup.make(new DruidCluster()))
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
DruidMasterRuntimeParams afterParams = ruleRunner.run(params);
@ -352,7 +352,7 @@ public class DruidMasterRuleRunnerTest
.withAvailableSegments(availableSegments)
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(segmentReplicantLookup)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
DruidMasterRuntimeParams afterParams = ruleRunner.run(params);
@ -414,7 +414,7 @@ public class DruidMasterRuleRunnerTest
.withAvailableSegments(availableSegments)
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(SegmentReplicantLookup.make(new DruidCluster()))
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
@ -679,7 +679,7 @@ public class DruidMasterRuleRunnerTest
.withAvailableSegments(availableSegments)
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(segmentReplicantLookup)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
DruidMasterRuntimeParams afterParams = ruleRunner.run(params);
@ -756,7 +756,7 @@ public class DruidMasterRuleRunnerTest
.withAvailableSegments(availableSegments)
.withDatabaseRuleManager(databaseRuleManager)
.withSegmentReplicantLookup(segmentReplicantLookup)
.withBalancerCostAnalyzer(new BalancerCostAnalyzer(new DateTime("2013-01-01")))
.withBalancerReferenceTimestamp(new DateTime("2013-01-01"))
.build();
DruidMasterRuntimeParams afterParams = ruleRunner.run(params);