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

HADOOP-12074. in Shell.java#runCommand() rethrow InterruptedException as InterruptedIOException (Contributed by Lavkesh Lahngir)

This commit is contained in:
Vinayakumar B 2015-06-11 11:51:14 +05:30
parent 5583f88bf7
commit 95c73d49b1
2 changed files with 7 additions and 1 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

@ -849,6 +849,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream
with accurate .getPos() (kanaka kumar avvaru via vinayakumarb) with accurate .getPos() (kanaka kumar avvaru via vinayakumarb)
HADOOP-12074. in Shell.java#runCommand() rethrow InterruptedException as
InterruptedIOException (Lavkesh Lahngir via vinayakumarb)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.InputStream; import java.io.InputStream;
import java.io.InterruptedIOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
@ -554,7 +555,9 @@ abstract public class Shell {
throw new ExitCodeException(exitCode, errMsg.toString()); throw new ExitCodeException(exitCode, errMsg.toString());
} }
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
throw new IOException(ie.toString()); InterruptedIOException iie = new InterruptedIOException(ie.toString());
iie.initCause(ie);
throw iie;
} finally { } finally {
if (timeOutTimer != null) { if (timeOutTimer != null) {
timeOutTimer.cancel(); timeOutTimer.cancel();