Repository: aurora Updated Branches: refs/heads/master 024bac9dc -> 217640f8e
Fix exception thrown in SchedulingBenchmarks set up. SchedulingBenchmarks were broken because of a missing binding to `TeirConfig` and an invalid parameter to `PreemptorModule`. Testing Done: ./gradlew jmh -Pbenchmarks='SchedulingBenchmarks.*' Reviewed at https://reviews.apache.org/r/42073/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/217640f8 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/217640f8 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/217640f8 Branch: refs/heads/master Commit: 217640f8e550f7a679e0d73c114080a124760d2b Parents: 024bac9 Author: Zameer Manji <[email protected]> Authored: Fri Jan 8 10:27:50 2016 -0800 Committer: Zameer Manji <[email protected]> Committed: Fri Jan 8 10:27:50 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/aurora/benchmark/SchedulingBenchmarks.java | 4 +++- src/main/java/org/apache/aurora/scheduler/TierManager.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/217640f8/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java ---------------------------------------------------------------------- diff --git a/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java b/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java index 2c09341..45ab76b 100644 --- a/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java +++ b/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java @@ -86,7 +86,7 @@ public class SchedulingBenchmarks { @Fork(1) @State(Scope.Thread) public abstract static class AbstractBase { - private static final Amount<Long, Time> NO_DELAY = Amount.of(0L, Time.MILLISECONDS); + private static final Amount<Long, Time> NO_DELAY = Amount.of(1L, Time.MILLISECONDS); private static final Amount<Long, Time> DELAY_FOREVER = Amount.of(30L, Time.DAYS); protected Storage storage; protected PendingTaskProcessor pendingTaskProcessor; @@ -135,6 +135,8 @@ public class SchedulingBenchmarks { bind(TaskScheduler.TaskSchedulerImpl.class).in(Singleton.class); bind(TierManager.class).to(TierManager.TierManagerImpl.class); bind(TierManager.TierManagerImpl.class).in(Singleton.class); + bind(TierManager.TierManagerImpl.TierConfig.class) + .toInstance(TierManager.TierManagerImpl.TierConfig.EMPTY); expose(TierManager.class); expose(TaskScheduler.class); expose(OfferManager.class); http://git-wip-us.apache.org/repos/asf/aurora/blob/217640f8/src/main/java/org/apache/aurora/scheduler/TierManager.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/TierManager.java b/src/main/java/org/apache/aurora/scheduler/TierManager.java index 2866efd..7367df4 100644 --- a/src/main/java/org/apache/aurora/scheduler/TierManager.java +++ b/src/main/java/org/apache/aurora/scheduler/TierManager.java @@ -44,8 +44,10 @@ public interface TierManager { class TierManagerImpl implements TierManager { private final TierConfig tierConfig; - static class TierConfig { - static final TierConfig EMPTY = new TierConfig(ImmutableMap.of()); + @VisibleForTesting + public static class TierConfig { + @VisibleForTesting + public static final TierConfig EMPTY = new TierConfig(ImmutableMap.of()); private final Map<String, TierInfo> tiers;
