hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject git commit: HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError. (Yongjun Zhang via wang)
Date Tue, 07 Oct 2014 21:57:43 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk b2f619752 -> 4b2834898


HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError. (Yongjun Zhang
via wang)


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

Branch: refs/heads/trunk
Commit: 4b2834898cbcc66ffbf01b2fb10375e79a50d538
Parents: b2f6197
Author: Andrew Wang <wang@apache.org>
Authored: Tue Oct 7 14:57:03 2014 -0700
Committer: Andrew Wang <wang@apache.org>
Committed: Tue Oct 7 14:57:03 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt              | 3 +++
 .../src/main/java/org/apache/hadoop/util/Shell.java          | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b283489/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9e3508c..e0428ca 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -353,6 +353,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin
     P. McCabe)
 
+    Improve error message in Shell#runCommand on OutOfMemoryError.
+    (Yongjun Zhang via wang)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4b283489/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index fcdc021..b78d791 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -519,7 +519,13 @@ abstract public class Shell {
     };
     try {
       errThread.start();
-    } catch (IllegalStateException ise) { }
+    } catch (IllegalStateException ise) {
+    } catch (OutOfMemoryError oe) {
+      LOG.error("Caught " + oe + ". One possible reason is that ulimit"
+          + " setting of 'max user processes' is too low. If so, do"
+          + " 'ulimit -u <largerNum>' and try again.");
+      throw oe;
+    }
     try {
       parseExecResult(inReader); // parse the output
       // clear the input stream buffer


Mime
View raw message