big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-13770. Shell.checkIsBashSupported swallowed an interrupted exception. Contributed by Wei-Chiu Chuang

Browse Source
This commit is contained in:
Jason Lowe 2016-10-28 14:57:50 +00:00
parent 3de130252d
commit c017171da0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -734,8 +734,7 @@ public static File getWinUtilsFile() throws FileNotFoundException {
} }
} }
public static final boolean isBashSupported = checkIsBashSupported(); public static boolean checkIsBashSupported() throws InterruptedIOException {
private static boolean checkIsBashSupported() {
if (Shell.WINDOWS) { if (Shell.WINDOWS) {
return false; return false;
} }
@ -746,6 +745,9 @@ private static boolean checkIsBashSupported() {
String[] args = {"bash", "-c", "echo 1000"}; String[] args = {"bash", "-c", "echo 1000"};
shexec = new ShellCommandExecutor(args); shexec = new ShellCommandExecutor(args);
shexec.execute(); shexec.execute();
} catch (InterruptedIOException iioe) {
LOG.warn("Interrupted, unable to determine if bash is supported", iioe);
throw iioe;
} catch (IOException ioe) { } catch (IOException ioe) {
LOG.warn("Bash is not supported by the OS", ioe); LOG.warn("Bash is not supported by the OS", ioe);
supported = false; supported = false;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
View File

@ -750,7 +750,7 @@ private void initAndStartNodeManager(Configuration conf, boolean hasToReboot) {
// Failed to start if we're a Unix based system but we don't have bash. // Failed to start if we're a Unix based system but we don't have bash.
// Bash is necessary to launch containers under Unix-based systems. // Bash is necessary to launch containers under Unix-based systems.
if (!Shell.WINDOWS) { if (!Shell.WINDOWS) {
if (!Shell.isBashSupported) { if (!Shell.checkIsBashSupported()) {
String message = String message =
"Failing NodeManager start since we're on a " "Failing NodeManager start since we're on a "
+ "Unix-based system but bash doesn't seem to be available."; + "Unix-based system but bash doesn't seem to be available.";