diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java index 9944122ff2487..ce5d72f32c6d9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java @@ -19,7 +19,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,6 +64,19 @@ public static void init() { LOG.info("Test: aggregate metrics are updated correctly"); } + @BeforeEach + public void setup() { + //reset metrics before each test + RouterMetrics.destroy(); + metrics = RouterMetrics.getMetrics(); + } + + @AfterEach + public void tearDown() { + RouterMetrics.destroy(); + metrics = RouterMetrics.getMetrics(); + } + /** * This test validates the correctness of the metric: Created Apps * successfully. @@ -2379,4 +2394,4 @@ public void testDeleteFederationPoliciesByQueuesRetrieved() { metrics.getLatencySucceededDeleteFederationPoliciesByQueuesRetrieved(), ASSERT_DOUBLE_DELTA); } -} \ No newline at end of file +}