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 bo...@apache.org on 2012/04/19 18:13:10 UTC
svn commit: r1328022 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java
src/main/packages/templates/conf/mapred-site.xml
src/site/apt/DeprecatedProperties.apt.vm
Author: bobby
Date: Thu Apr 19 16:13:09 2012
New Revision: 1328022
URL: http://svn.apache.org/viewvc?rev=1328022&view=rev
Log:
svn merge -c 1328018 from trunk. FIXES: HADOOP-8288. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1328022&r1=1328021&r2=1328022&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr 19 16:13:09 2012
@@ -11,6 +11,9 @@ Release 0.23.3 - UNRELEASED
HADOOP-8108. Move method getHostPortString() from NameNode to NetUtils.
(Brandon Li via jitendra and bobby)
+ HADOOP-8288. Remove references of mapred.child.ulimit etc. since they are
+ not being used any more (Ravi Prakash via bobby)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1328022&r1=1328021&r2=1328022&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java Thu Apr 19 16:13:09 2012
@@ -81,64 +81,6 @@ abstract public class Shell {
/** If or not script timed out*/
private AtomicBoolean timedOut;
- /** a Unix command to get ulimit of a process. */
- public static final String ULIMIT_COMMAND = "ulimit";
-
- /**
- * Get the Unix command for setting the maximum virtual memory available
- * to a given child process. This is only relevant when we are forking a
- * process from within the Mapper or the Reducer implementations.
- * Also see Hadoop Pipes and Hadoop Streaming.
- *
- * It also checks to ensure that we are running on a *nix platform else
- * (e.g. in Cygwin/Windows) it returns <code>null</code>.
- * @param memoryLimit virtual memory limit
- * @return a <code>String[]</code> with the ulimit command arguments or
- * <code>null</code> if we are running on a non *nix platform or
- * if the limit is unspecified.
- */
- public static String[] getUlimitMemoryCommand(int memoryLimit) {
- // ulimit isn't supported on Windows
- if (WINDOWS) {
- return null;
- }
-
- return new String[] {ULIMIT_COMMAND, "-v", String.valueOf(memoryLimit)};
- }
-
- /**
- * Get the Unix command for setting the maximum virtual memory available
- * to a given child process. This is only relevant when we are forking a
- * process from within the Mapper or the Reducer implementations.
- * see also Hadoop Pipes and Streaming.
- *
- * It also checks to ensure that we are running on a *nix platform else
- * (e.g. in Cygwin/Windows) it returns <code>null</code>.
- * @param conf configuration
- * @return a <code>String[]</code> with the ulimit command arguments or
- * <code>null</code> if we are running on a non *nix platform or
- * if the limit is unspecified.
- * @deprecated Use {@link #getUlimitMemoryCommand(int)}
- */
- @Deprecated
- public static String[] getUlimitMemoryCommand(Configuration conf) {
- // ulimit isn't supported on Windows
- if (WINDOWS) {
- return null;
- }
-
- // get the memory limit from the configuration
- String ulimit = conf.get("mapred.child.ulimit");
- if (ulimit == null) {
- return null;
- }
-
- // Parse it to ensure it is legal/sane
- int memoryLimit = Integer.valueOf(ulimit);
-
- return getUlimitMemoryCommand(memoryLimit);
- }
-
/** Set to true on Windows platforms */
public static final boolean WINDOWS /* borrowed from Path.WINDOWS */
= System.getProperty("os.name").startsWith("Windows");
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml?rev=1328022&r1=1328021&r2=1328022&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml Thu Apr 19 16:13:09 2012
@@ -101,11 +101,6 @@
</property>
<property>
- <name>mapred.child.ulimit</name>
- <value>8388608</value>
- </property>
-
- <property>
<name>mapred.job.tracker.persist.jobstatus.active</name>
<value>true</value>
<description>Indicates if persistency of job status information is
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm?rev=1328022&r1=1328021&r2=1328022&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm Thu Apr 19 16:13:09 2012
@@ -316,8 +316,6 @@ Deprecated Properties
*---+---+
|mapred.map.child.log.level | mapreduce.map.log.level
*---+---+
-|mapred.map.child.ulimit | mapreduce.map.ulimit
-*---+---+
|mapred.map.max.attempts | mapreduce.map.maxattempts
*---+---+
|mapred.map.output.compression.codec | mapreduce.map.output.compress.codec
@@ -380,8 +378,6 @@ Deprecated Properties
*---+---+
|mapred.reduce.child.log.level | mapreduce.reduce.log.level
*---+---+
-|mapred.reduce.child.ulimit | mapreduce.reduce.ulimit
-*---+---+
|mapred.reduce.max.attempts | mapreduce.reduce.maxattempts
*---+---+
|mapred.reduce.parallel.copies | mapreduce.reduce.shuffle.parallelcopies