hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rang...@apache.org
Subject svn commit: r699445 - in /hadoop/core/branches/branch-0.19: ./ CHANGES.txt conf/hadoop-default.xml src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
Date Fri, 26 Sep 2008 18:22:24 GMT
Author: rangadi
Date: Fri Sep 26 11:22:24 2008
New Revision: 699445

URL: http://svn.apache.org/viewvc?rev=699445&view=rev
Log:
HADOOP-4173. fix failures in TestProcfsBasedProcessTree and
TestTaskTrackerMemoryManager tests. ProcfsBasedProcessTree and
memory management in TaskTracker are disabled on Windows.
(Vinod K V via rangadi)   

Modified:
    hadoop/core/branches/branch-0.19/   (props changed)
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/conf/hadoop-default.xml
    hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java

Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 11:22:24 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=699445&r1=699444&r2=699445&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Fri Sep 26 11:22:24 2008
@@ -747,6 +747,11 @@
     HADOOP-4275. Move public method isJobValidName from JobID to a private
     method in JobTracker. (omalley)
 
+    HADOOP-4173. fix failures in TestProcfsBasedProcessTree and
+    TestTaskTrackerMemoryManager tests. ProcfsBasedProcessTree and
+    memory management in TaskTracker are disabled on Windows.
+    (Vinod K V via rangadi)
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/branches/branch-0.19/conf/hadoop-default.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/conf/hadoop-default.xml?rev=699445&r1=699444&r2=699445&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/conf/hadoop-default.xml (original)
+++ hadoop/core/branches/branch-0.19/conf/hadoop-default.xml Fri Sep 26 11:22:24 2008
@@ -720,7 +720,9 @@
   <name>mapred.tasktracker.taskmemorymanager.monitoring-interval</name>
   <value>5000</value>
   <description>The interval, in milliseconds, for which the tasktracker waits
-   between two cycles of monitoring its tasks' memory usage.</description>
+   between two cycles of monitoring its tasks' memory usage. Used only if
+   tasks' memory management is enabled via mapred.tasktracker.tasks.maxmemory.
+   </description>
 </property>
 
 <property>
@@ -728,7 +730,8 @@
   <value>5000</value>
   <description>The time, in milliseconds, the tasktracker waits for sending a
   SIGKILL to a process that has overrun memory limits, after it has been sent
-  a SIGTERM.</description>
+  a SIGTERM. Used only if tasks' memory management is enabled via
+  mapred.tasktracker.tasks.maxmemory.</description>
 </property>
 
 <property>
@@ -1468,7 +1471,9 @@
   	tasks. Any task scheduled on this tasktracker is guaranteed and constrained
   	 to use a share of this amount. Any task exceeding its share will be 
   	killed. If set to -1, this functionality is disabled, and 
-  	mapred.task.maxmemory is ignored.
+  	mapred.task.maxmemory is ignored. Further, it will be enabled only on the
+  	systems where org.apache.hadoop.util.ProcfsBasedProcessTree is available,
+  	i.e at present only on Linux.
   </description>
 </property>
 

Modified: hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java?rev=699445&r1=699444&r2=699445&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
(original)
+++ hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/util/ProcfsBasedProcessTree.java
Fri Sep 26 11:22:24 2008
@@ -39,7 +39,7 @@
 import org.apache.hadoop.util.Shell.ShellCommandExecutor;
 
 /**
- * A Proc file-system based ProcfsBasedProcessTree. Works on Linux and Cygwin.
+ * A Proc file-system based ProcessTree. Works only on Linux.
  */
 public class ProcfsBasedProcessTree {
 
@@ -72,10 +72,9 @@
   public static boolean isAvailable() {
     try {
       String osName = System.getProperty("os.name");
-      if (!osName.startsWith("Linux") && !osName.startsWith("Windows")) {
-        LOG
-            .info("ProcfsBasedProcfsBasedProcessTree currently is supported only "
-                + "on Linux and Windows");
+      if (!osName.startsWith("Linux")) {
+        LOG.info("ProcfsBasedProcessTree currently is supported only on "
+            + "Linux.");
         return false;
       }
     } catch (SecurityException se) {



Mime
View raw message