Repository: aurora Updated Branches: refs/heads/master 51b29c5a5 -> 669f27999
Fixing benchmarks. Reviewed at https://reviews.apache.org/r/33202/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/669f2799 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/669f2799 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/669f2799 Branch: refs/heads/master Commit: 669f279997eafcd4c2c449de35d85a0fcf2ad819 Parents: 51b29c5 Author: Maxim Khutornenko <[email protected]> Authored: Tue Apr 14 20:28:11 2015 -0700 Committer: Maxim Khutornenko <[email protected]> Committed: Tue Apr 14 20:28:11 2015 -0700 ---------------------------------------------------------------------- .../org/apache/aurora/benchmark/SchedulingBenchmarks.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/669f2799/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 0113505..12f42a9 100644 --- a/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java +++ b/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java @@ -45,6 +45,7 @@ import org.apache.aurora.scheduler.async.OfferManager; import org.apache.aurora.scheduler.async.RescheduleCalculator; import org.apache.aurora.scheduler.async.TaskScheduler; import org.apache.aurora.scheduler.async.TaskScheduler.TaskSchedulerImpl.ReservationDuration; +import org.apache.aurora.scheduler.async.preemptor.BiCache; import org.apache.aurora.scheduler.async.preemptor.ClusterStateImpl; import org.apache.aurora.scheduler.async.preemptor.Preemptor; import org.apache.aurora.scheduler.async.preemptor.PreemptorModule; @@ -130,7 +131,11 @@ public class SchedulingBenchmarks { return DELAY_FOREVER; } }); - + bind(BiCache.BiCacheSettings.class).toInstance( + new BiCache.BiCacheSettings(DELAY_FOREVER, "")); + bind(TaskScheduler.class).to(TaskScheduler.TaskSchedulerImpl.class); + bind(TaskScheduler.TaskSchedulerImpl.class).in(Singleton.class); + expose(TaskScheduler.class); expose(OfferManager.class); } }, @@ -140,8 +145,6 @@ public class SchedulingBenchmarks { bind(new TypeLiteral<Amount<Long, Time>>() { }) .annotatedWith(ReservationDuration.class) .toInstance(DELAY_FOREVER); - bind(TaskScheduler.class).to(TaskScheduler.TaskSchedulerImpl.class); - bind(TaskScheduler.TaskSchedulerImpl.class).in(Singleton.class); bind(TaskIdGenerator.class).to(TaskIdGenerator.TaskIdGeneratorImpl.class); bind(SchedulingFilter.class).to(SchedulingFilterImpl.class); bind(SchedulingFilterImpl.class).in(Singleton.class);
