Ottomata has submitted this change and it was merged.
Change subject: Adding mapreduce_shuffle_port parameter
......................................................................
Adding mapreduce_shuffle_port parameter
Change-Id: If11c87bbd64146171f8b39c1466fa590ddc7b26c
---
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M templates/hadoop/mapred-site.xml.erb
3 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 0323a43..8e47462 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -46,6 +46,7 @@
# $mapreduce_task_io_sort_factor
# $mapreduce_map_java_opts
# $mapreduce_child_java_opts
+# $mapreduce_shuffle_port
# $mapreduce_intermediate_compression - If true, intermediate
MapReduce data
# will be compressed. Default:
true.
# Rmapreduce_intermediate_compression_codec - Codec class to use for
intermediate compression.
@@ -98,6 +99,7 @@
$mapreduce_task_io_sort_factor =
$::cdh4::hadoop::defaults::mapreduce_task_io_sort_factor,
$mapreduce_map_java_opts =
$::cdh4::hadoop::defaults::mapreduce_map_java_opts,
$mapreduce_reduce_java_opts =
$::cdh4::hadoop::defaults::mapreduce_reduce_java_opts,
+ $mapreduce_shuffle_port =
$::cdh4::hadoop::defaults::mapreduce_shuffle_port,
$mapreduce_intermediate_compression =
$::cdh4::hadoop::defaults::mapreduce_intermediate_compression,
$mapreduce_intermediate_compression_codec =
$::cdh4::hadoop::defaults::mapreduce_intermediate_compression_codec,
$mapreduce_output_compression =
$::cdh4::hadoop::defaults::mapreduce_output_compession,
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index 694c4c3..0cdb7c9 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -27,6 +27,7 @@
$mapreduce_task_io_sort_factor = undef
$mapreduce_map_java_opts = undef
$mapreduce_reduce_java_opts = undef
+ $mapreduce_shuffle_port = undef
$mapreduce_intermediate_compression = false
$mapreduce_intermediate_compression_codec =
'org.apache.hadoop.io.compress.DefaultCodec'
$mapreduce_output_compression = false
diff --git a/templates/hadoop/mapred-site.xml.erb
b/templates/hadoop/mapred-site.xml.erb
index fd528db..4f65cd7 100644
--- a/templates/hadoop/mapred-site.xml.erb
+++ b/templates/hadoop/mapred-site.xml.erb
@@ -32,6 +32,13 @@
<value>/user/history/done</value>
</property>
+<% if @mapreduce_shuffle_port -%>
+ <property>
+ <name>mapreduce.shuffle.port</name>
+ <value><%= @mapreduce_shuffle_port %></value>
+ </property>
+
+<% end -%>
<property>
<name>mapred.job.tracker</name>
<!-- Hue gets confused if mapred.job.tracker is not set,
--
To view, visit https://gerrit.wikimedia.org/r/107207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If11c87bbd64146171f8b39c1466fa590ddc7b26c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh4
Gerrit-Branch: master
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
