From 333f9a896d8a4407ce69cfd0dc8314587a339233 Mon Sep 17 00:00:00 2001 From: Xuan Date: Fri, 8 May 2015 17:52:54 -0700 Subject: [PATCH] YARN-3602. TestResourceLocalizationService.testPublicResourceInitializesLocalDir fails Intermittently due to IOException from cleanup. Contributed by zhihai xu --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../localizer/TestResourceLocalizationService.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 02a5efbbb8..05ae1444ba 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -382,6 +382,9 @@ Release 2.8.0 - UNRELEASED YARN-2206. Updated document for applications REST API response examples. (Kenji Kikushima and Brahma Reddy Battula via zjshen) + YARN-3602. TestResourceLocalizationService.testPublicResourceInitializesLocalDir + fails Intermittently due to IOException from cleanup. (zhihai xu via xgong) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java index 07001ad835..296cba6ad4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java @@ -184,7 +184,11 @@ public void setup() throws IOException { @After public void cleanup() throws IOException { conf = null; - FileUtils.deleteDirectory(new File(basedir.toString())); + try { + FileUtils.deleteDirectory(new File(basedir.toString())); + } catch (IOException e) { + // ignore + } } @Test