|
@@ -32,6 +32,7 @@ import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
import org.apache.hadoop.conf.Configuration;
|
|
|
import org.apache.hadoop.io.DataOutputBuffer;
|
|
|
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
|
|
import org.apache.hadoop.security.Credentials;
|
|
|
import org.apache.hadoop.security.UserGroupInformation;
|
|
|
import org.apache.hadoop.security.token.Token;
|
|
@@ -96,6 +97,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEventType;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeImpl;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeStartedEvent;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler;
|
|
|
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplication;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt;
|
|
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode;
|
|
@@ -153,6 +155,9 @@ public class MockRM extends ResourceManager {
|
|
|
public MockRM(Configuration conf, RMStateStore store,
|
|
|
boolean useNullRMNodeLabelsManager, boolean useRealElector) {
|
|
|
super();
|
|
|
+ // Clear metrics to avoid possible interference between tests
|
|
|
+ DefaultMetricsSystem.shutdown();
|
|
|
+ QueueMetrics.clearQueueMetrics();
|
|
|
if (conf.getBoolean(TestResourceUtils.TEST_CONF_RESET_RESOURCE_TYPES,
|
|
|
true)) {
|
|
|
ResourceUtils.resetResourceTypes(conf);
|