Ottomata has submitted this change and it was merged.
Change subject: Puppetizing HADOOP_NAMENODE_OPTS in order to set heap size
specifically for namenode
......................................................................
Puppetizing HADOOP_NAMENODE_OPTS in order to set heap size specifically for
namenode
Change-Id: Icb8f68d48a0bd7dc7e6f6144e20b8405035200e7
---
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M templates/hadoop/hadoop-env.sh.erb
3 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 0133b09..3a6528b 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -74,6 +74,7 @@
# your own scheduler config .xml
files
# outside of the cdh module.
# $hadoop_heapsize - -Xmx for NameNode and
DataNode. Default: undef
+# $hadoop_namenode_opts - Any additional opts to pass to
NameNode node on startup. Default: undef
# $yarn_heapsize - -Xmx for YARN Daemons.
Default: undef
# $ganglia_hosts - Set this to an array of
ganglia host:ports
# if you want to enable ganglia
sinks in hadoop-metrics2.properites
@@ -129,6 +130,7 @@
$yarn_scheduler_minimum_allocation_mb =
$::cdh::hadoop::defaults::yarn_scheduler_minimum_allocation_mb,
$yarn_scheduler_maximum_allocation_mb =
$::cdh::hadoop::defaults::yarn_scheduler_maximum_allocation_mb,
$hadoop_heapsize =
$::cdh::hadoop::defaults::hadoop_heapsize,
+ $hadoop_namenode_opts =
$::cdh::hadoop::defaults::hadoop_namenode_opts,
$yarn_heapsize =
$::cdh::hadoop::defaults::yarn_heapsize,
$ganglia_hosts =
$::cdh::hadoop::defaults::ganglia_hosts,
$net_topology_script_template =
$::cdh::hadoop::defaults::net_topology_script_template,
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index 7ff2474..7ebff5b 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -45,6 +45,7 @@
$fair_scheduler_template =
'cdh/hadoop/fair-scheduler.xml.erb'
$hadoop_heapsize = undef
+ $hadoop_namenode_opts = undef
$yarn_heapsize = undef
$ganglia_hosts = undef
diff --git a/templates/hadoop/hadoop-env.sh.erb
b/templates/hadoop/hadoop-env.sh.erb
index 5e897f8..ea85b67 100644
--- a/templates/hadoop/hadoop-env.sh.erb
+++ b/templates/hadoop/hadoop-env.sh.erb
@@ -41,4 +41,7 @@
HADOOP_HEAPSIZE=<%= @hadoop_heapsize %>
<% end -%>
-HADOOP_NAMENODE_OPTS="$HADOOP_NAMENODE_OPTS -Xmx2000m"
\ No newline at end of file
+<% if @hadoop_namenode_opts -%>
+# Any additionally supplied HADOOP_NAMENODE_OPTS
+HADOOP_NAMENODE_OPTS="<%= @hadoop_namenode_opts %> $HADOOP_NAMENODE_OPTS"
+<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/190469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb8f68d48a0bd7dc7e6f6144e20b8405035200e7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
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
