From 0a0592147a22d95fd0a1dc10596db77f0b137d61 Mon Sep 17 00:00:00 2001 From: Zhengxi Li Date: Sun, 15 Nov 2020 19:29:27 -0600 Subject: [PATCH 1/2] Clear filesystem statistics after tests in TestTaskProgressReporter --- .../java/org/apache/hadoop/mapred/TestTaskProgressReporter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java index 6d34270e12e64..234ddda9aab98 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java @@ -324,5 +324,6 @@ public void uncaughtException(Thread th, Throwable ex) { reporter.resetDoneFlag(); t.join(); Assert.assertEquals(failFast, threadExited); + FileSystem.clearStatistics(); } } \ No newline at end of file From a95a7b346ea154dcf1b70f388ed0c4f2f5b2592f Mon Sep 17 00:00:00 2001 From: Zhengxi Li Date: Tue, 31 Aug 2021 00:26:44 -0500 Subject: [PATCH 2/2] Addressed reveiw comment --- .../org/apache/hadoop/mapred/TestTaskProgressReporter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java index 234ddda9aab98..52875b7aca708 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskProgressReporter.java @@ -34,6 +34,7 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.checkpoint.TaskCheckpointID; import org.apache.hadoop.util.ExitUtil; +import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -179,6 +180,11 @@ protected void checkTaskLimits() throws TaskLimitException { } } + @After + public void cleanup() { + FileSystem.clearStatistics(); + } + @Test(timeout=60000) public void testScratchDirSize() throws Exception { String tmpPath = TEST_DIR + "/testBytesWrittenLimit-tmpFile-" @@ -324,6 +330,5 @@ public void uncaughtException(Thread th, Throwable ex) { reporter.resetDoneFlag(); t.join(); Assert.assertEquals(failFast, threadExited); - FileSystem.clearStatistics(); } } \ No newline at end of file