YARN-10297. TestContinuousScheduling#testFairSchedulerContinuousSchedulingInitTime fails intermittently. Contributed by Jim Brennan (Jim_Brennan)

This commit is contained in:
Eric E Payne 2020-07-13 18:57:50 +00:00
parent 806d84b79c
commit 0427100b75
2 changed files with 6 additions and 0 deletions

View File

@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
import com.google.common.base.Supplier;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ContainerId;
@ -35,6 +36,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.placement.ApplicationPlacem
import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ClusterNodeTracker;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
import org.apache.hadoop.yarn.server.scheduler.SchedulerRequestKey;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.TestUtils;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
@ -86,6 +88,9 @@ public class TestContinuousScheduling extends FairSchedulerTestBase {
@SuppressWarnings("deprecation")
@Before
public void setup() {
QueueMetrics.clearQueueMetrics();
DefaultMetricsSystem.setMiniClusterMode(true);
mockClock = new ControlledClock();
conf = createConfiguration();
resourceManager = new MockRM(conf);

View File

@ -146,6 +146,7 @@ public class TestFairScheduler extends FairSchedulerTestBase {
@Before
public void setUp() throws IOException {
DefaultMetricsSystem.setMiniClusterMode(true);
scheduler = new FairScheduler();
conf = createConfiguration();
resourceManager = new MockRM(conf);