You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ji...@apache.org on 2012/05/27 09:32:02 UTC
svn commit: r1343008 - in /incubator/ambari/branches/ambari-186: ./
hmc/archive/ShellScripts/ hmc/archive/ShellScripts/templates/
hmc/archive/php/ hmc/db/ hmc/php/frontend/
hmc/puppet/modules/hdp-hadoop/manifests/
hmc/puppet/modules/hdp-hadoop/templates/
Author: jitendra
Date: Sun May 27 07:32:01 2012
New Revision: 1343008
URL: http://svn.apache.org/viewvc?rev=1343008&view=rev
Log:
AMBARI-275. Remove the configuration variable fs.inmemory.size.mb. Contributed by Suresh Srinivas.
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/configureClusterAdvanced.sh
incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/templates/gsCluster.properties.in
incubator/ambari/branches/ambari-186/hmc/archive/php/deploy.php
incubator/ambari/branches/ambari-186/hmc/db/schema.dump
incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/params.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/templates/core-site.xml.erb
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Sun May 27 07:32:01 2012
@@ -6,6 +6,9 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-275. Remove the configuration variable fs.inmemory.size.mb.
+ (Suresh Srinivas via jitendra)
+
AMBARI-303. Cleanup testing code for uninstall failure (simulation).
(vikram via jitendra)
Modified: incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/configureClusterAdvanced.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/configureClusterAdvanced.sh?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/configureClusterAdvanced.sh (original)
+++ incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/configureClusterAdvanced.sh Sun May 27 07:32:01 2012
@@ -158,7 +158,6 @@ eval "${cmd}";
read -r -d '' gsClusterConf << EOConf
s!@HDPHadoopHeapSize@!${HDPHadoopHeapSize}!g
s!@HDPNameNodeHeapSize@!${HDPNameNodeHeapSize}!g
-s!@HDPFSInMemorySize@!${HDPFSInMemorySize}!g
s!@HDPNameNodeOptNewSize@!${HDPNameNodeOptNewSize}!g
s!@HDPDataNodeDuReserved@!${HDPDataNodeDuReserved}!g
s!@HDPDataNodeHeapSize@!${HDPDataNodeHeapSize}!g
Modified: incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/templates/gsCluster.properties.in
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/templates/gsCluster.properties.in?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/templates/gsCluster.properties.in (original)
+++ incubator/ambari/branches/ambari-186/hmc/archive/ShellScripts/templates/gsCluster.properties.in Sun May 27 07:32:01 2012
@@ -19,7 +19,6 @@
hadoop_heap_size=@HDPHadoopHeapSize@
namenode_javaheap=@HDPNameNodeHeapSize@
-fs_inmemory_size=@HDPFSInMemorySize@
namenode_opt_newsize=@HDPNameNodeOptNewSize@
datanode_du_reserved=@HDPDataNodeDuReserved@
Modified: incubator/ambari/branches/ambari-186/hmc/archive/php/deploy.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/archive/php/deploy.php?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/archive/php/deploy.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/archive/php/deploy.php Sun May 27 07:32:01 2012
@@ -68,7 +68,7 @@ file_put_contents($finalGsInstallerProps
/* Dead code
// Templated variables
// All props to be replace eventually. TODO:
-#$varsToBeReplaced = array("@HDPHadoopHeapSize@", "@HDPNameNodeHeapSize@", "@HDPFSInMemorySize@", "@HDPNameNodeOptNewSize@", "@HDPDataNodeDuReserved@", "@HDPDataNodeHeapSize@", "@HDPJobTrackerOptNewSize@", "@HDPJobTrackerOptMaxNewSize@", "@HDPJobTrackerHeapSize@", "@HDPMapRedMapTasksMax@", "@HDPMapRedReduceTasksMax@", "@HDPMapRedClusterMapMemoryMB@", "@HDPMapRedClusterReduceMemoryMB@", "@HDPMapRedClusterMaxMapMemoryMB@", "@HDPMapRedClusterMaxReduceMemoryMB@", "@HDPMapRedJobMapMemoryMB@", "@HDPMapRedJobReduceMemoryMB@", "@HDPMapRedChildJavaOptsSize@", "@HDPIoSortMB@", "@HDPIoSortSpillPercent@", "@HDPMapReduceUserLogRetainHours@", "@HDPMaxTasksPerJob@", "@HDPDFSDataNodeFailedVolumeTolerated@", "@HDPHBaseMasterHeapSize@", "@HDPHBaseRegionServerHeapSize@");
+#$varsToBeReplaced = array("@HDPHadoopHeapSize@", "@HDPNameNodeHeapSize@", "@HDPNameNodeOptNewSize@", "@HDPDataNodeDuReserved@", "@HDPDataNodeHeapSize@", "@HDPJobTrackerOptNewSize@", "@HDPJobTrackerOptMaxNewSize@", "@HDPJobTrackerHeapSize@", "@HDPMapRedMapTasksMax@", "@HDPMapRedReduceTasksMax@", "@HDPMapRedClusterMapMemoryMB@", "@HDPMapRedClusterReduceMemoryMB@", "@HDPMapRedClusterMaxMapMemoryMB@", "@HDPMapRedClusterMaxReduceMemoryMB@", "@HDPMapRedJobMapMemoryMB@", "@HDPMapRedJobReduceMemoryMB@", "@HDPMapRedChildJavaOptsSize@", "@HDPIoSortMB@", "@HDPIoSortSpillPercent@", "@HDPMapReduceUserLogRetainHours@", "@HDPMaxTasksPerJob@", "@HDPDFSDataNodeFailedVolumeTolerated@", "@HDPHBaseMasterHeapSize@", "@HDPHBaseRegionServerHeapSize@");
#$varsToBeReplaced = array( "@HDPNameNodeHeapSize@", "@HDPJobTrackerHeapSize@", "@HDPHBaseMasterHeapSize@", "@HDPDataNodeHeapSize@", "@HDPHadoopHeapSize@", "@HDPMapRedChildJavaOptsSize@" );
$valuesToReplaceWith = array($memoryOptionsSuggestions["HDPNameNodeHeapSize"], $memoryOptionsSuggestions["HDPJobTrackerHeapSize"], $memoryOptionsSuggestions["HDPHBaseMasterHeapSize"], $memoryOptionsSuggestions["HDPDataNodeHeapSize"], $memoryOptionsSuggestions["HDPHadoopHeapSize"], $memoryOptionsSuggestions["HDPMapRedChildJavaOptsSize"]);
// Replace all the tags with correspond values
@@ -88,7 +88,6 @@ $gsClusterProps["@HDPDataNodeHeapSize@"]
$gsClusterProps["@HDPHadoopHeapSize@"] = $memoryOptionsSuggestions["HDPHadoopHeapSize"];
$gsClusterProps["@HDPMapRedChildJavaOptsSize@"] = $memoryOptionsSuggestions["HDPMapRedChildJavaOptsSize"];
$gsClusterProps["@HDPHBaseRegionServerHeapSize@"] = "1024m";
-$gsClusterProps["@HDPFSInMemorySize@"] = "256";
$gsClusterProps["@HDPNameNodeOptNewSize@"] = "640m";
$gsClusterProps["@HDPDataNodeDuReserved@"] = "1073741824";
$gsClusterProps["@HDPJobTrackerOptNewSize@"] = "200m";
Modified: incubator/ambari/branches/ambari-186/hmc/db/schema.dump
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/db/schema.dump?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/db/schema.dump (original)
+++ incubator/ambari/branches/ambari-186/hmc/db/schema.dump Sun May 27 07:32:01 2012
@@ -269,9 +269,6 @@ INSERT OR REPLACE INTO "ConfigProperties
-- maps to namenode_javaheap in gsCluster.properties in MB
INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description, service_name, display_type, display_attributes ) VALUES ( "namenode_heapsize", "1024", "NameNode maximum Java heap size", "Java Heap Size for NameNode", "HDFS" , "", '{ "isPassword": false, "noDisplay": false, "reconfigurable": true, "displayType": "text", "unit":"MB" }' );
--- maps to fs_inmemory_size in gsCluster.properties in MB
-INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description, service_name, display_type, display_attributes ) VALUES ( "fs_inmemory_size", "256", "Merge Mem Size", "Memory allocated for in memory FS", "HDFS" , "", '{ "isPassword": false, "noDisplay": false, "reconfigurable": true, "displayType": "text", "unit":"MB" }' );
-
-- maps to namenode_opt_newsize in gscluster in MB
INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description, service_name, display_type, display_attributes ) VALUES ( "namenode_opt_newsize", "200", "Hadoop Young Generation heap size", "Maximum size for New Generation for java heap size", "HDFS" , "", '{ "isPassword": false, "noDisplay": false, "reconfigurable": true, "displayType": "text", "unit":"MB" }' );
Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/configUtils.php Sun May 27 07:32:01 2012
@@ -227,11 +227,6 @@ function validateConfigs($svcConfigs) {
if ($check["error"] != "") {
$errors[$key] = $check;
}
- } else if ($key == "fs_inmemory_size") {
- $check = basicNumericCheck($val, FALSE);
- if ($check["error"] != "") {
- $errors[$key] = $check;
- }
} else if ($key == "namenode_opt_newsize") {
$check = basicNumericCheck($val, FALSE);
if ($check["error"] != "") {
@@ -388,7 +383,6 @@ function validateConfigs($svcConfigs) {
nagios_contact|nagiosadmin@hortonworks.com
hadoop_heapsize|1024
namenode_heapsize|1024
- fs_inmemory_size|256
namenode_opt_newsize|200
datanode_du_reserved|1073741824
dtnode_heapsize|1024
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/params.pp?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/params.pp Sun May 27 07:32:01 2012
@@ -57,8 +57,6 @@ class hdp-hadoop::params(
### core-site
$enable_security_authorization = hdp_default("hadoop/core-site/enable_security_authorization","false")
- $fs_inmemory_size = hdp_default("hadoop/core-site/fs_inmemory_size",256)
-
$proxyuser_group = hdp_default("hadoop/core-site/proxyuser_group","users")
$security_type = hdp_default("hadoop/core-site/security_type","simple")
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/templates/core-site.xml.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/templates/core-site.xml.erb?rev=1343008&r1=1343007&r2=1343008&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/templates/core-site.xml.erb (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/templates/core-site.xml.erb Sun May 27 07:32:01 2012
@@ -46,11 +46,6 @@
</property>
<property>
- <name>fs.inmemory.size.mb</name>
- <value><%=scope.function_hdp_template_var("fs_inmemory_size")%></value>
- </property>
-
- <property>
<name>fs.trash.interval</name>
<value>360</value>
<description>Number of minutes between trash checkpoints.