You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2016/02/09 17:52:01 UTC
hadoop git commit: YARN-3602.
TestResourceLocalizationService.testPublicResourceInitializesLocalDir fails
Intermittently due to IOException from cleanup. Contributed by zhihai xu
(cherry picked from commit 333f9a896d8a4407ce69cfd0dc8314587a339233)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 6257ed843 -> f264939c4
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
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f264939c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f264939c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f264939c
Branch: refs/heads/branch-2.7
Commit: f264939c476acada632a873e184ebc25d2b94dcf
Parents: 6257ed8
Author: Jason Lowe <jl...@apache.org>
Authored: Tue Feb 9 16:51:36 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Tue Feb 9 16:51:36 2016 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../localizer/TestResourceLocalizationService.java | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f264939c/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1da6fb7..448920a 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f264939c/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
----------------------------------------------------------------------
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 ca0c29f..3413d73 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