incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1347287 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/util/suggestProperties.php
Date Thu, 07 Jun 2012 01:51:16 GMT
Author: vikram
Date: Thu Jun  7 01:51:16 2012
New Revision: 1347287

URL: http://svn.apache.org/viewvc?rev=1347287&view=rev
Log:
AMBARI-469. Cap DataNode heap size. (Contributed by Mahadev)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/util/suggestProperties.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347287&r1=1347286&r2=1347287&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 01:51:16 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-469. Cap DataNode heap size. (Mahadev via Vikram)
+
   AMBARI-467. Fix hive stop to escape $. (Mahadev via Vikram)
 
   AMBARI-446. Support Resume For Manage Services (Varun via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/php/util/suggestProperties.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/util/suggestProperties.php?rev=1347287&r1=1347286&r2=1347287&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/util/suggestProperties.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/util/suggestProperties.php Thu Jun  7 01:51:16
2012
@@ -63,14 +63,14 @@ class SuggestProperties {
   }
 
   function allocateHeapSizeWithMax($componentName, $hostRoles, $hostInfoMap,
-      $allHostsToComponents, $is32bit) {
+      $allHostsToComponents, $is32bit, $max) {
     $heapSizeT = $this->allocateHeapSizeForDaemon($componentName, $hostRoles, $hostInfoMap,
         $allHostsToComponents, $is32bit);
-    if ($heapSizeT > 3072) {
-      $heapSize = 3072;
+    if ($heapSizeT > $max) {
+      $heapSizeT = $max;
     }
 
-    $this->logger->log_info("Calculating Maxed Heap Size For ".$componentName ." $heapSizeT"
);
+    $this->logger->log_info("Calculating Maxed Heap Size For ".$componentName ." $heapSizeT
with max $max" );
     return $heapSizeT; 
   }
 
@@ -265,8 +265,9 @@ class SuggestProperties {
           $hostInfoMap, $allHostsToComponents, FALSE);
       $result["configs"]["hbase_master_heapsize"] = $hbaseHeap;
     }
-    $heapSize = $this->allocateHeapSizeForDaemon("DATANODE", $hostRoles,
-        $hostInfoMap, $allHostsToComponents, TRUE);
+    $heapSize = $this->allocateHeapSizeWithMax("DATANODE", $hostRoles,
+        $hostInfoMap, $allHostsToComponents, TRUE, 2048);
+    // cap the datanode heap size and hadoop heap size
     $result["configs"]["dtnode_heapsize"] = $heapSize;
     $result["configs"]["hadoop_heapsize"] = $heapSize;
 
@@ -275,7 +276,7 @@ class SuggestProperties {
     $heapSize = $this->allocateHeapSizeForDaemon("TASKTRACKER", $hostRoles,
         $hostInfoMap, $allHostsToComponents, TRUE);
     $heapSizeWithMax = $this->allocateHeapSizeWithMax("TASKTRACKER", $hostRoles,
-        $hostInfoMap, $allHostsToComponents, TRUE);
+        $hostInfoMap, $allHostsToComponents, TRUE, 3072);
     $this->logger->log_info("Maxed Heap Size for MR Child opts ".$heapSizeWithMax);
     $result["configs"]["mapred_child_java_opts_sz"] = $heapSizeWithMax;
 



Mime
View raw message