Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE5A5D8AE for ; Mon, 13 Aug 2012 03:15:56 +0000 (UTC) Received: (qmail 70602 invoked by uid 500); 13 Aug 2012 03:15:56 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 70491 invoked by uid 500); 13 Aug 2012 03:15:53 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 70459 invoked by uid 99); 13 Aug 2012 03:15:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2012 03:15:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2012 03:15:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2182F23888E4; Mon, 13 Aug 2012 03:15:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1372251 - in /incubator/ambari/trunk: CHANGES.txt hmc/php/puppet/DBReader.php hmc/php/util/suggestProperties.php hmc/puppet/modules/hdp-hadoop/manifests/params.pp Date: Mon, 13 Aug 2012 03:15:04 -0000 To: ambari-commits@incubator.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120813031505.2182F23888E4@eris.apache.org> Author: mahadev Date: Mon Aug 13 03:15:04 2012 New Revision: 1372251 URL: http://svn.apache.org/viewvc?rev=1372251&view=rev Log: AMBARI-664. Fix mapred io sort mb and heap size for map/reduce. (mahadev) Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/hmc/php/puppet/DBReader.php incubator/ambari/trunk/hmc/php/util/suggestProperties.php incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/params.pp Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1372251&r1=1372250&r2=1372251&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Mon Aug 13 03:15:04 2012 @@ -86,6 +86,8 @@ Trunk (unreleased changes) BUG FIXES + AMBARI-664. Fix mapred io sort mb and heap size for map/reduce. (mahadev) + AMBARI-661. Deploy cluster fails during Hive/HCatalog test (mahadev via yusaku) AMBARI-654. Enter the value of the service properties that are not meant to Modified: incubator/ambari/trunk/hmc/php/puppet/DBReader.php URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/puppet/DBReader.php?rev=1372251&r1=1372250&r2=1372251&view=diff ============================================================================== --- incubator/ambari/trunk/hmc/php/puppet/DBReader.php (original) +++ incubator/ambari/trunk/hmc/php/puppet/DBReader.php Mon Aug 13 03:15:04 2012 @@ -239,7 +239,6 @@ class DBReader { "jtnode_heapsize" => "m", "ttnode_heapsize" => "m", "mapred_child_java_opts_sz" => "m", - "io_sort_mb" => "m", "hbase_master_heapsize" => "m", "hbase_regionserver_heapsize" => "m" ); Modified: incubator/ambari/trunk/hmc/php/util/suggestProperties.php URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/util/suggestProperties.php?rev=1372251&r1=1372250&r2=1372251&view=diff ============================================================================== --- incubator/ambari/trunk/hmc/php/util/suggestProperties.php (original) +++ incubator/ambari/trunk/hmc/php/util/suggestProperties.php Mon Aug 13 03:15:04 2012 @@ -276,7 +276,7 @@ class SuggestProperties { $heapSize = $this->allocateHeapSizeWithMax("TASKTRACKER", $hostRoles, $hostInfoMap, $allHostsToComponents, TRUE, 2048); $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"]["ttnode_heapsize"] = $heapSize; $result["configs"]["mapred_child_java_opts_sz"] = $heapSizeWithMax; Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/params.pp URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/params.pp?rev=1372251&r1=1372250&r2=1372251&view=diff ============================================================================== --- incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/params.pp (original) +++ incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/params.pp Mon Aug 13 03:15:04 2012 @@ -128,7 +128,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")