svn commit: r1373712 - in /incubator/ambari/branches/branch-0.9: CHANGES.txt hmc/php/puppet/DBReader.php hmc/php/util/suggestProperties.php hmc/puppet/modules/hdp-hadoop/manifests/params.pp

[yu...@apache.org]

Author: yusaku
Date: Thu Aug 16 03:08:55 2012
New Revision: 1373712

URL: http://svn.apache.org/viewvc?rev=1373712&view=rev
Log:
AMBARI-664. Fix mapred io sort mb and heap size for map/reduce.
 (Contributed by mahadev)

Modified:
    incubator/ambari/branches/branch-0.9/CHANGES.txt
    incubator/ambari/branches/branch-0.9/hmc/php/puppet/DBReader.php
    incubator/ambari/branches/branch-0.9/hmc/php/util/suggestProperties.php
    incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hadoop/manifests/params.pp

Modified: incubator/ambari/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/CHANGES.txt?rev=1373712&r1=1373711&r2=1373712&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-0.9/CHANGES.txt Thu Aug 16 03:08:55 2012
@@ -6,6 +6,9 @@ characters wide.
 
 Release 0.9.0 - unreleased
 
+  AMBARI-664. Fix mapred io sort mb and heap size for map/reduce (mahadev via
+  yusaku)
+
   AMBARI-652. Large number of spurious logs due to undefined variables
   (yusaku)
 

Modified: incubator/ambari/branches/branch-0.9/hmc/php/puppet/DBReader.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/php/puppet/DBReader.php?rev=1373712&r1=1373711&r2=1373712&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/php/puppet/DBReader.php (original)
+++ incubator/ambari/branches/branch-0.9/hmc/php/puppet/DBReader.php Thu Aug 16 03:08:55 2012
@@ -229,7 +229,6 @@ class DBReader {
      "jtnode_opt_maxnewsize" => "m",
      "jtnode_heapsize" => "m",
      "mapred_child_java_opts_sz" => "m",
-     "io_sort_mb" => "m",
      "hbase_master_heapsize" => "m",
      "hbase_regionserver_heapsize" => "m"
   );

Modified: incubator/ambari/branches/branch-0.9/hmc/php/util/suggestProperties.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/php/util/suggestProperties.php?rev=1373712&r1=1373711&r2=1373712&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/php/util/suggestProperties.php (original)
+++ incubator/ambari/branches/branch-0.9/hmc/php/util/suggestProperties.php Thu Aug 16 03:08:55 2012
@@ -276,7 +276,7 @@ class SuggestProperties {
     $heapSize = $this->allocateHeapSizeForDaemon("TASKTRACKER", $hostRoles,
         $hostInfoMap, $allHostsToComponents, TRUE);
     $heapSizeWithMax = $this->allocateHeapSizeWithMax("TASKTRACKER", $hostRoles,
-        $hostInfoMap, $allHostsToComponents, TRUE, 3072);
+        $hostInfoMap, $allHostsToComponents, TRUE, 2048);
     $this->logger->log_info("Maxed Heap Size for MR Child opts ".$heapSizeWithMax);
     $result["configs"]["mapred_child_java_opts_sz"] = $heapSizeWithMax;
 

Modified: incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hadoop/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hadoop/manifests/params.pp?rev=1373712&r1=1373711&r2=1373712&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hadoop/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hadoop/manifests/params.pp Thu Aug 16 03:08:55 2012
@@ -118,7 +118,7 @@ class hdp-hadoop::params(
 
   $mapred_system_dir = '/mapred/system'
 
-  $io_sort_mb = hdp_default("hadoop/mapred-site/io_sort_mb","200m")
+  $io_sort_mb = hdp_default("hadoop/mapred-site/io_sort_mb","200")
 
   $io_sort_spill_percent = hdp_default("hadoop/mapred-site/io_sort_spill_percent","0.9")