diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java index 09ef2cf9035..48ec0b99a29 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java @@ -66,7 +66,8 @@ new ConcurrentHashMap<>(); // logger - private static final Logger LOG = LoggerFactory.getLogger(SLSCapacityScheduler.class); + private static final Logger LOG = LoggerFactory.getLogger(SLSFairScheduler.class); + public SchedulerMetrics getSchedulerMetrics() { return schedulerMetrics; diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java index 22e1e2e729e..9d694e6c533 100644 --- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java +++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java @@ -46,8 +46,9 @@ public static Collection data() { // Test with both schedulers, and all three trace types return Arrays.asList(new Object[][] { - {CapacityScheduler.class.getCanonicalName(), "SYNTH", - "src/test/resources/syn.json", null}, + //Only run FS for this isolated test + //{CapacityScheduler.class.getCanonicalName(), "SYNTH", + //"src/test/resources/syn.json", null}, {FairScheduler.class.getCanonicalName(), "SYNTH", "src/test/resources/syn.json", null} }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index bc21a17cc73..0945fb0e877 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -18,12 +18,11 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair; -import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting; -import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions; -import org.apache.hadoop.thirdparty.com.google.common.collect.Lists; -import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.SettableFuture; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.conf.Configuration; @@ -865,6 +864,7 @@ public Allocation allocate(ApplicationAttemptId appAttemptId, List ask, List schedulingRequests, List release, List blacklistAdditions, List blacklistRemovals, ContainerUpdates updateRequests) { + if (true) throw new RuntimeException("test unchecked exception"); // Make sure this application exists FSAppAttempt application = getSchedulerApp(appAttemptId); if (application == null) {