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 ju...@apache.org on 2016/07/09 12:11:21 UTC
hadoop git commit: Fix OOM issue in DistributedShell. Contributed by
Jian He. (cherry picked from commit 9bdb5bebea1183ec2f697ee3e55392df4fe697bb)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ee23094b1 -> 7db796562
Fix OOM issue in DistributedShell. Contributed by Jian He.
(cherry picked from commit 9bdb5bebea1183ec2f697ee3e55392df4fe697bb)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7db79656
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7db79656
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7db79656
Branch: refs/heads/branch-2
Commit: 7db796562c0a512bb626c207b6ed0169e3bbe92f
Parents: ee23094
Author: Junping Du <ju...@apache.org>
Authored: Sat Jul 9 05:09:53 2016 -0700
Committer: Junping Du <ju...@apache.org>
Committed: Sat Jul 9 05:11:29 2016 -0700
----------------------------------------------------------------------
.../yarn/applications/distributedshell/ApplicationMaster.java | 1 +
.../apache/hadoop/yarn/applications/distributedshell/Client.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db79656/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
index 703595c..380b822 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
@@ -900,6 +900,7 @@ public class ApplicationMaster {
@Override
public void onError(Throwable e) {
+ LOG.error("Error in RMCallbackHandler: ", e);
done = true;
amRMClient.stop();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db79656/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
index 9879b1e..c8c9303 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
@@ -128,7 +128,7 @@ public class Client {
// Queue for App master
private String amQueue = "";
// 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
private int amVCores = 1;
@@ -359,7 +359,7 @@ public class Client {
appName = cliParser.getOptionValue("appname", "DistributedShell");
amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
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"));
if (amMemory < 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org