You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by dm...@apache.org on 2017/05/23 21:58:43 UTC
aurora git commit: Fix SchedulingBenchmarks broken in Mesos
Maintenance and Update Affinity patches.
Repository: aurora
Updated Branches:
refs/heads/master 4c0974bc4 -> 767563ec7
Fix SchedulingBenchmarks broken in Mesos Maintenance and Update Affinity patches.
Reviewed at https://reviews.apache.org/r/59478/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/767563ec
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/767563ec
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/767563ec
Branch: refs/heads/master
Commit: 767563ec7a960f4d0359969bbe5afb01d989de20
Parents: 4c0974b
Author: David McLaughlin <da...@dmclaughlin.com>
Authored: Tue May 23 14:49:16 2017 -0700
Committer: David McLaughlin <dm...@twitter.com>
Committed: Tue May 23 14:49:16 2017 -0700
----------------------------------------------------------------------
.../org/apache/aurora/benchmark/SchedulingBenchmarks.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/767563ec/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 f2296a9..b933a5b 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/SchedulingBenchmarks.java
@@ -53,6 +53,7 @@ import org.apache.aurora.scheduler.mesos.Driver;
import org.apache.aurora.scheduler.mesos.TestExecutorSettings;
import org.apache.aurora.scheduler.offers.OfferManager;
import org.apache.aurora.scheduler.offers.OfferSettings;
+import org.apache.aurora.scheduler.offers.OffersModule;
import org.apache.aurora.scheduler.preemptor.BiCache;
import org.apache.aurora.scheduler.preemptor.ClusterStateImpl;
import org.apache.aurora.scheduler.preemptor.PendingTaskProcessor;
@@ -67,6 +68,7 @@ import org.apache.aurora.scheduler.storage.db.DbUtil;
import org.apache.aurora.scheduler.storage.entities.IHostAttributes;
import org.apache.aurora.scheduler.storage.entities.IScheduledTask;
import org.apache.aurora.scheduler.storage.entities.IServerInfo;
+import org.apache.aurora.scheduler.updater.UpdateAgentReserver;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
@@ -156,6 +158,11 @@ public class SchedulingBenchmarks {
.annotatedWith(ReservationDuration.class)
.toInstance(DELAY_FOREVER);
bind(TaskIdGenerator.class).to(TaskIdGenerator.TaskIdGeneratorImpl.class);
+ bind(new TypeLiteral<Amount<Long, Time>>() { })
+ .annotatedWith(OffersModule.UnavailabilityThreshold.class)
+ .toInstance(Amount.of(1L, Time.MINUTES));
+ bind(UpdateAgentReserver.class).to(UpdateAgentReserver.NullAgentReserver.class);
+ bind(UpdateAgentReserver.NullAgentReserver.class).in(Singleton.class);
bind(SchedulingFilter.class).to(SchedulingFilterImpl.class);
bind(SchedulingFilterImpl.class).in(Singleton.class);
bind(ExecutorSettings.class).toInstance(TestExecutorSettings.THERMOS_EXECUTOR);