hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From junping...@apache.org
Subject hadoop git commit: Fix OOM issue in DistributedShell. Contributed by Jian He. (cherry picked from commit 9bdb5bebea1183ec2f697ee3e55392df4fe697bb) (cherry picked from commit 7db796562c0a512bb626c207b6ed0169e3bbe92f)
Date Sat, 09 Jul 2016 12:12:16 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 96e68e722 -> 25ea7cc37


Fix OOM issue in DistributedShell. Contributed by Jian He.
(cherry picked from commit 9bdb5bebea1183ec2f697ee3e55392df4fe697bb)
(cherry picked from commit 7db796562c0a512bb626c207b6ed0169e3bbe92f)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/25ea7cc3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/25ea7cc3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/25ea7cc3

Branch: refs/heads/branch-2.8
Commit: 25ea7cc37313da394ecc654c04b80f2aecc1ece6
Parents: 96e68e7
Author: Junping Du <junping_du@apache.org>
Authored: Sat Jul 9 05:09:53 2016 -0700
Committer: Junping Du <junping_du@apache.org>
Committed: Sat Jul 9 05:12:21 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/25ea7cc3/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 05e6edc..09262bc 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
@@ -862,6 +862,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/25ea7cc3/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 f349e99..5a14780 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
@@ -127,7 +127,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;
 
@@ -344,7 +344,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


Mime
View raw message