Updated Branches: refs/heads/branch-1.4.1 86dd8e600 -> f1c029ff2
AMBARI-3485. Cannot submit job after customizing hadoop group and enabling security. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f1c029ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f1c029ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f1c029ff Branch: refs/heads/branch-1.4.1 Commit: f1c029ff2139cd54a8724af945cac856f2232346 Parents: 86dd8e6 Author: Siddharth Wagle <[email protected]> Authored: Tue Oct 8 18:19:40 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Tue Oct 8 18:21:27 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-hadoop/manifests/params.pp | 2 ++ .../puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f1c029ff/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp index 2a477e8..4b1fe64 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp @@ -183,6 +183,8 @@ class hdp-hadoop::params( } else { $mapred_local_dir = hdp_default("mapred-site/mapred.local.dir","/tmp/hadoop-mapred/mapred/local") } + + $mapred_tt_group = hdp_default("mapred-site/mapreduce.tasktracker.group", "hadoop") $mapreduce_userlog_retainhours = hdp_default("mapred-site/mapreduce.userlog.retainhours",24) http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f1c029ff/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb index e012f71..78fd75e 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/taskcontroller.cfg.erb @@ -16,5 +16,5 @@ # * limitations under the License. # */ mapred.local.dir=<%=scope.function_hdp_template_var("mapred_local_dir")%> -mapreduce.tasktracker.group=<%=scope.function_hdp_default(["::mapred-site/mapreduce.tasktracker.group","hadoop"])%> +mapreduce.tasktracker.group=<%=scope.function_hdp_template_var("mapred_tt_group")%> hadoop.log.dir=<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/<%=scope.function_hdp_template_var("mapred_user")%>
