You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 03:31:16 UTC
svn commit: r1347267 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/puppet/modules/hdp-hadoop/manifests/params.pp
hmc/puppet/modules/hdp-hadoop/manifests/snamenode.pp
hmc/puppet/modules/hdp-hadoop/templates/core-site.xml.erb
Author: vikram
Date: Thu Jun 7 01:31:16 2012
New Revision: 1347267
URL: http://svn.apache.org/viewvc?rev=1347267&view=rev
Log:
AMBARI-457. Create template for SNN checkpoint dir (Contributed by Ramya)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/params.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/snamenode.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=1347267&r1=1347266&r2=1347267&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 01:31:16 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-457. Create template for SNN checkpoint dir (Ramya via Vikram)
+
AMBARI-456. Add more logging for ganglia (Ramya via Vikram)
AMBARI-455. nagios shows service status critical if hbase is not installed (Suhas via Vikram)
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=1347267&r1=1347266&r2=1347267&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 Thu Jun 7 01:31:16 2012
@@ -59,6 +59,8 @@ class hdp-hadoop::params(
### core-site
$enable_security_authorization = hdp_default("hadoop/core-site/enable_security_authorization","false")
+ $fs_checkpoint_dir = hdp_default("hadoop/core-site/fs_checkpoint_dir","/tmp/dfs/namesecondary")
+
$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/manifests/snamenode.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/snamenode.pp?rev=1347267&r1=1347266&r2=1347267&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/snamenode.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hadoop/manifests/snamenode.pp Thu Jun 7 01:31:16 2012
@@ -11,14 +11,14 @@ class hdp-hadoop::snamenode(
if ($service_state == 'no_op') {
} elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
- $dfs_name_dir = $hdp-hadoop::params::dfs_name_dir
+ $fs_checkpoint_dir = $hdp-hadoop::params::fs_checkpoint_dir
#adds package, users and directories, and common hadoop configs
include hdp-hadoop::initialize
Hdp-Hadoop::Configfile<||>{snamenode_host => $hdp::params::host_address}
- hdp-hadoop::snamenode::create_name_dirs { $dfs_name_dir:
+ hdp-hadoop::snamenode::create_name_dirs { $fs_checkpoint_dir:
service_state => $service_state
}
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=1347267&r1=1347266&r2=1347267&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 Thu Jun 7 01:31:16 2012
@@ -54,6 +54,27 @@
</property>
<property>
+ <name>fs.checkpoint.dir</name>
+ <value><%=scope.function_hdp_template_var("fs_checkpoint_dir")%></value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary images to merge.
+ If this is a comma-delimited list of directories then the image is
+ replicated in all of the directories for redundancy.
+ </description>
+ </property>
+
+ <property>
+ <name>fs.checkpoint.edits.dir</name>
+ <value>${fs.checkpoint.dir}</value>
+ <description>Determines where on the local filesystem the DFS secondary
+ name node should store the temporary edits to merge.
+ If this is a comma-delimited list of directoires then teh edits is
+ replicated in all of the directoires for redundancy.
+ Default value is same as fs.checkpoint.dir
+ </description>
+ </property>
+
+ <property>
<name>fs.checkpoint.period</name>
<value>86400</value>
<description>The number of seconds between two periodic checkpoints.