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

Fix OOM issue in DistributedShell. Contributed by Jian He. 

(cherry picked from commit 9bdb5bebea)
(cherry picked from commit 7db796562c)
This commit is contained in:
Junping Du 2016-07-09 05:09:53 -07:00
parent 96e68e722f
commit 25ea7cc373
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
View File

@ -862,6 +862,7 @@ public class ApplicationMaster {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
LOG.error("Error in RMCallbackHandler: ", e);
done = true; done = true;
amRMClient.stop(); amRMClient.stop();
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
View File

@ -127,7 +127,7 @@ public class Client {
// Queue for App master // Queue for App master
private String amQueue = ""; private String amQueue = "";
// Amt. of memory resource to request for to run the App Master // Amt. of memory resource to request for to run the App Master
private long amMemory = 10; private long amMemory = 100;
// Amt. of virtual core resource to request for to run the App Master // Amt. of virtual core resource to request for to run the App Master
private int amVCores = 1; private int amVCores = 1;
@ -344,7 +344,7 @@ public class Client {
appName = cliParser.getOptionValue("appname", "DistributedShell"); appName = cliParser.getOptionValue("appname", "DistributedShell");
amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0")); amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
amQueue = cliParser.getOptionValue("queue", "default"); amQueue = cliParser.getOptionValue("queue", "default");
amMemory = Integer.parseInt(cliParser.getOptionValue("master_memory", "10")); amMemory = Integer.parseInt(cliParser.getOptionValue("master_memory", "100"));
amVCores = Integer.parseInt(cliParser.getOptionValue("master_vcores", "1")); amVCores = Integer.parseInt(cliParser.getOptionValue("master_vcores", "1"));
if (amMemory < 0) { if (amMemory < 0) {