From 25ea7cc37313da394ecc654c04b80f2aecc1ece6 Mon Sep 17 00:00:00 2001
From: Junping Du <junping_du@apache.org>
Date: Sat, 9 Jul 2016 05:09:53 -0700
Subject: [PATCH] Fix OOM issue in DistributedShell. Contributed by Jian He.
 (cherry picked from commit 9bdb5bebea1183ec2f697ee3e55392df4fe697bb) (cherry
 picked from commit 7db796562c0a512bb626c207b6ed0169e3bbe92f)

---
 .../yarn/applications/distributedshell/ApplicationMaster.java | 1 +
 .../hadoop/yarn/applications/distributedshell/Client.java     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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 05e6edc6ec0..09262bca7f4 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 float getProgress() {
 
     @Override
     public void onError(Throwable e) {
+      LOG.error("Error in RMCallbackHandler: ", e);
       done = true;
       amRMClient.stop();
     }
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 f349e99cece..5a147800634 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 boolean init(String[] args) throws ParseException {
     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) {