hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hadoop git commit: YARN-9009. Fix flaky test TestEntityGroupFSTimelineStore.testCleanLogs. Contributed by OrDTesters.
Date Mon, 10 Dec 2018 04:16:28 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.2 3ab6ea7ac -> 2b3c3d2a3


YARN-9009. Fix flaky test TestEntityGroupFSTimelineStore.testCleanLogs. Contributed by OrDTesters.

(cherry picked from commit 1c09a10e9601bd628f1e887f3bf92c5a4ac286ab)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2b3c3d2a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b3c3d2a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b3c3d2a

Branch: refs/heads/branch-3.2
Commit: 2b3c3d2a32631a0af304c8e0fc5bb0d97f4e1507
Parents: 3ab6ea7
Author: Weiwei Yang <wwei@apache.org>
Authored: Mon Dec 10 11:55:24 2018 +0800
Committer: Weiwei Yang <wwei@apache.org>
Committed: Mon Dec 10 12:07:23 2018 +0800

----------------------------------------------------------------------
 .../yarn/server/timeline/TestEntityGroupFSTimelineStore.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b3c3d2a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
index 0458722..61da3c8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
@@ -70,7 +70,7 @@ public class TestEntityGroupFSTimelineStore extends TimelineStoreTestUtils
{
 
   private static final String SAMPLE_APP_PREFIX_CACHE_TEST = "1234_000";
   private static final int CACHE_TEST_CACHE_SIZE = 5;
-  
+
   private static final String TEST_SUMMARY_LOG_FILE_NAME
       = EntityGroupFSTimelineStore.SUMMARY_LOG_PREFIX + "test";
   private static final String TEST_DOMAIN_LOG_FILE_NAME
@@ -234,6 +234,8 @@ public class TestEntityGroupFSTimelineStore extends TimelineStoreTestUtils
{
     Path pathAfter = appLogs.getAppDirPath();
     assertNotEquals(pathBefore, pathAfter);
     assertTrue(pathAfter.toString().contains(testDoneDirPath.toString()));
+
+    fs.delete(pathAfter, true);
   }
 
   @Test
@@ -483,7 +485,7 @@ public class TestEntityGroupFSTimelineStore extends TimelineStoreTestUtils
{
       AppState appstate) {
     // stop before creating new store to get the lock
     store.stop();
-    
+
     EntityGroupFSTimelineStore newStore = new EntityGroupFSTimelineStore() {
       @Override
       protected AppState getAppState(ApplicationId appId) throws IOException {


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message