You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/04/24 01:08:40 UTC
svn commit: r1471195 - in /incubator/ambari/trunk: CHANGES.txt
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
Author: smohanty
Date: Tue Apr 23 23:08:39 2013
New Revision: 1471195
URL: http://svn.apache.org/r1471195
Log:
AMBARI-2009. task-log4j.properties file ownership should not be root. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1471195&r1=1471194&r2=1471195&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 23 23:08:39 2013
@@ -774,6 +774,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2009. task-log4j.properties file ownership should not be
+ root. (smohanty)
+
AMBARI-2008. Using mixed OS overwrites ambari.repo during install. (smohanty)
AMBARI-1952. hadoop dependency version for ambari-log4j is hardcoded, making
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1471195&r1=1471194&r2=1471195&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp Tue Apr 23 23:08:39 2013
@@ -107,6 +107,16 @@ debug('##Configs generation for hdp-hado
}
}
+ $task_log4j_properties_location = "${conf_dir}/task-log4j.properties"
+
+ file { $task_log4j_properties_location:
+ owner => $hdp-hadoop::params::mapred_user,
+ group => $hdp::params::user_group,
+ mode => 644,
+ ensure => present,
+ source => "puppet:///modules/hdp-hadoop/task-log4j.properties",
+ replace => false
+ }
if has_key($configuration, 'capacity-scheduler') {
configgenerator::configfile{'capacity-scheduler':
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp?rev=1471195&r1=1471194&r2=1471195&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/tasktracker.pp Tue Apr 23 23:08:39 2013
@@ -53,19 +53,7 @@ class hdp-hadoop::tasktracker(
}
}
- $task_log4j_properties_location = "${conf_dir}/task-log4j.properties"
-
- file { $task_log4j_properties_location:
- owner => $hdp-hadoop::params::mapred_user,
- group => $hdp::params::user_group,
- mode => 664,
- ensure => present,
- source => "puppet:///modules/hdp-hadoop/task-log4j.properties",
- replace => false
- }
-
-
- hdp-hadoop::tasktracker::create_local_dirs { $mapred_local_dir:
+ hdp-hadoop::tasktracker::create_local_dirs { $mapred_local_dir:
service_state => $service_state
}
@@ -86,7 +74,7 @@ class hdp-hadoop::tasktracker(
#top level does not need anchors
Class['hdp-hadoop'] -> Hdp-hadoop::Service['tasktracker']
- Hdp-hadoop::Tasktracker::Create_local_dirs<||> -> File[$task_log4j_properties_location]-> Hdp-hadoop::Service['tasktracker']
+ Hdp-hadoop::Tasktracker::Create_local_dirs<||> -> Hdp-hadoop::Service['tasktracker']
} else {
hdp_fail("TODO not implemented yet: service_state = ${service_state}")
}