Repository: bigtop Updated Branches: refs/heads/master df9f29e56 -> 63a857464
BIGTOP-1855: Remove Obsolete Jobtracker settings from mapred-site.xml Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/63a85746 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/63a85746 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/63a85746 Branch: refs/heads/master Commit: 63a8574644cd68ea34290ec8613f77e45953af98 Parents: df9f29e Author: Olaf Flebbe <[email protected]> Authored: Thu Apr 30 11:24:42 2015 +0200 Committer: Olaf Flebbe <[email protected]> Committed: Fri May 1 22:46:42 2015 +0200 ---------------------------------------------------------------------- .../puppet/modules/hadoop/manifests/init.pp | 6 ---- .../modules/hadoop/templates/mapred-site.xml | 35 -------------------- 2 files changed, 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/63a85746/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp index 89f15c4..45168ba 100644 --- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp @@ -291,17 +291,12 @@ class hadoop ($hadoop_security_authentication = "simple", class common_mapred_app ( $mapreduce_cluster_acls_enabled = undef, - $mapreduce_jobtracker_taskscheduler = undef, $mapreduce_jobhistory_host = undef, $mapreduce_jobhistory_port = "10020", $mapreduce_jobhistory_webapp_port = "19888", $mapreduce_framework_name = "yarn", - $jobtracker_host, - $jobtracker_port = "8021", $mapred_data_dirs = suffix($hadoop::hadoop_storage_dirs, "/mapred"), $mapreduce_cluster_temp_dir = "/mapred/system", - $mapreduce_jobtracker_system_dir = "/mapred/system", - $mapreduce_jobtracker_staging_root_dir = "/user", $yarn_app_mapreduce_am_staging_dir = "/user", $mapreduce_task_io_sort_factor = 64, # 10 default $mapreduce_task_io_sort_mb = 256, # 100 default @@ -313,7 +308,6 @@ class hadoop ($hadoop_security_authentication = "simple", $mapreduce_output_fileoutputformat_compress_type = "BLOCK", # "RECORD" default $mapreduce_map_output_compress = undef, $mapreduce_job_reduce_slowstart_completedmaps = undef, - $mapred_jobtracker_plugins = "", $hadoop_security_authentication = $hadoop::hadoop_security_authentication, $kerberos_realm = $hadoop::kerberos_realm, ) inherits hadoop { http://git-wip-us.apache.org/repos/asf/bigtop/blob/63a85746/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml index d9e842f..1c8f3fd 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml @@ -75,14 +75,6 @@ </property> <% end %> -<!-- specify JobTracker TaskScheduler --> -<% if @mapreduce_jobtracker_taskscheduler %> - <property> - <name>mapreduce.jobtracker.taskscheduler</name> - <value><%= @hadoop_jobtracker_taskscheduler %></value> - </property> - -<% end %> <% if @mapreduce_jobhistory_host %> <property> <name>mapreduce.jobhistory.address</name> @@ -100,11 +92,6 @@ </property> <property> - <name>mapreduce.jobtracker.address</name> - <value><%= @jobtracker_host %>:<%= @jobtracker_port%></value> - </property> - - <property> <name>mapreduce.cluster.local.dir</name> <value><%= @mapred_data_dirs.join(",") %></value> <final>true</final> @@ -117,20 +104,6 @@ </property> <% end -%> -<% if @mapreduce_jobtracker_system_dir -%> - <property> - <name>mapreduce.jobtracker.system.dir</name> - <value><%= @mapreduce_cluster_temp_dir %></value> - </property> - -<% end -%> -<% if @mapreduce_jobtracker_staging_root_dir -%> - <property> - <name>mapreduce.jobtracker.staging.root.dir</name> - <value><%= @mapreduce_jobtracker_staging_root_dir %></value> - </property> - -<% end -%> <% if @yarn_app_mapreduce_am_staging_dir -%> <property> <name>yarn.app.mapreduce.am.staging-dir</name> @@ -216,12 +189,4 @@ </property> <% end -%> -<% if @mapred_jobtracker_plugins -%> - <property> - <name>mapred.jobtracker.plugins</name> - <value><%= @mapred_jobtracker_plugins %></value> - <description>Comma-separated list of jobtracker plug-ins to be activated.</description> - </property> - -<% end -%> </configuration>
