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 ar...@apache.org on 2013/08/29 02:11:58 UTC
svn commit: r1518421 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java
Author: arp
Date: Thu Aug 29 00:11:58 2013
New Revision: 1518421
URL: http://svn.apache.org/r1518421
Log:
HADOOP-9894. Merging change r1518420 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1518421&r1=1518420&r2=1518421&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 29 00:11:58 2013
@@ -159,6 +159,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9899. Remove the debug message, added by HADOOP-8855, from
KerberosAuthenticator. (szetszwo)
+ HADOOP-9894. Race condition in Shell leads to logged error stream handling
+ exceptions (Arpit Agarwal)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1518421&r1=1518420&r2=1518421&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java Thu Aug 29 00:11:58 2013
@@ -515,8 +515,13 @@ abstract public class Shell {
} catch (IOException ioe) {
LOG.warn("Error while closing the input stream", ioe);
}
- if (!completed.get()) {
- errThread.interrupt();
+ try {
+ if (!completed.get()) {
+ errThread.interrupt();
+ errThread.join();
+ }
+ } catch (InterruptedException ie) {
+ LOG.warn("Interrupted while joining errThread");
}
try {
errReader.close();