From f264939c476acada632a873e184ebc25d2b94dcf Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Tue, 9 Feb 2016 16:51:36 +0000 Subject: [PATCH] YARN-3602. TestResourceLocalizationService.testPublicResourceInitializesLocalDir fails Intermittently due to IOException from cleanup. Contributed by zhihai xu (cherry picked from commit 333f9a896d8a4407ce69cfd0dc8314587a339233) Conflicts: hadoop-yarn-project/CHANGES.txt --- 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 1da6fb7152d..448920a9218 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -84,6 +84,9 @@ Release 2.7.3 - UNRELEASED YARN-3102. Decommisioned Nodes not listed in Web UI (Kuhu Shukla via jlowe) + YARN-3602. TestResourceLocalizationService.testPublicResourceInitializesLocalDir + fails Intermittently due to IOException from cleanup. (zhihai xu via xgong) + Release 2.7.2 - 2016-01-25 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 ca0c29fde20..3413d735112 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 @@ -191,7 +191,11 @@ public class TestResourceLocalizationService { @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