Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9894. Race condition in Shell leads to logged error stream handling exceptions (Arpit Agarwal) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518420 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2013-08-29 00:06:04 +00:00
parent 56c1b9de0c
commit 4ba7a5e564
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -429,6 +429,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9887. globStatus does not correctly handle paths starting with a drive HADOOP-9887. globStatus does not correctly handle paths starting with a drive
spec on Windows. (Chuan Liu via cnauroth) spec on Windows. (Chuan Liu via cnauroth)
HADOOP-9894. Race condition in Shell leads to logged error stream handling
exceptions (Arpit Agarwal)
Release 2.1.0-beta - 2013-08-22 Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
View File

@ -515,8 +515,13 @@ abstract public class Shell {
} catch (IOException ioe) { } catch (IOException ioe) {
LOG.warn("Error while closing the input stream", ioe); LOG.warn("Error while closing the input stream", ioe);
} }
if (!completed.get()) { try {
errThread.interrupt(); if (!completed.get()) {
errThread.interrupt();
errThread.join();
}
} catch (InterruptedException ie) {
LOG.warn("Interrupted while joining errThread");
} }
try { try {
errReader.close(); errReader.close();