Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347353 )
Change subject: Add JVM options tunables for Yarn RM and Hadoop DN/NN
......................................................................
Add JVM options tunables for Yarn RM and Hadoop DN/NN
Bug: T159219
Change-Id: Ic67e44225dbbdbe6c2e3b27986e505296812ddf6
---
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M templates/hadoop/hadoop-env.sh.erb
M templates/hadoop/yarn-env.sh.erb
4 files changed, 20 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh
refs/changes/53/347353/1
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index ed3f306..3699ec7 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -179,6 +179,9 @@
$yarn_scheduler_maximum_allocation_vcores =
$::cdh::hadoop::defaults::yarn_scheduler_maximum_allocation_vcores,
$hadoop_heapsize =
$::cdh::hadoop::defaults::hadoop_heapsize,
$hadoop_namenode_opts =
$::cdh::hadoop::defaults::hadoop_namenode_opts,
+ $hadoop_datanode_opts =
$::cdh::hadoop::defaults::hadoop_datanode_opts,
+ $yarn_resourcemanager_opts =
$::cdh::hadoop::defaults::yarn_resourcemanager_opts,
+ $yarn_nodemanager_opts =
$::cdh::hadoop::defaults::yarn_nodemanager_opts,
$yarn_heapsize =
$::cdh::hadoop::defaults::yarn_heapsize,
$dfs_datanode_hdfs_blocks_metadata_enabled =
$::cdh::hadoop::defaults::dfs_datanode_hdfs_blocks_metadata_enabled,
$ganglia_hosts =
$::cdh::hadoop::defaults::ganglia_hosts,
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index e758737..5d5dbe3 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -64,8 +64,11 @@
$hadoop_heapsize = undef
$hadoop_namenode_opts = undef
+ $yarn_resourcemanager_opts = undef
$yarn_heapsize = undef
$dfs_datanode_hdfs_blocks_metadata_enabled = undef
+ $yarn_nodemanager_opts = undef
+ $hadoop_datanode_opts = undef
$ganglia_hosts = undef
$net_topology_script_template = undef
diff --git a/templates/hadoop/hadoop-env.sh.erb
b/templates/hadoop/hadoop-env.sh.erb
index 78a9254..b660fbe 100644
--- a/templates/hadoop/hadoop-env.sh.erb
+++ b/templates/hadoop/hadoop-env.sh.erb
@@ -53,5 +53,10 @@
<% if @hadoop_namenode_opts -%>
# Any additionally supplied HADOOP_NAMENODE_OPTS
-HADOOP_NAMENODE_OPTS="<%= @hadoop_namenode_opts %> $HADOOP_NAMENODE_OPTS"
+HADOOP_NAMENODE_OPTS="$HADOOP_NAMENODE_OPTS <%= @hadoop_namenode_opts %>"
+<% end -%>
+
+<% if @hadoop_datanode_opts -%>
+# Any additionally supplied HADOOP_DATANODE_OPTS
+HADOOP_DATANODE_OPTS="$HADOOP_DATANODE_OPTS <%= @hadoop_datanode_opts %>"
<% end -%>
diff --git a/templates/hadoop/yarn-env.sh.erb b/templates/hadoop/yarn-env.sh.erb
index d639b1a..127c62d 100644
--- a/templates/hadoop/yarn-env.sh.erb
+++ b/templates/hadoop/yarn-env.sh.erb
@@ -56,8 +56,10 @@
<% if @resourcemanager_jmxremote_port -%>
# Enable YARN ResourceManager JMX connections on port <%=
@resourcemanager_jmxremote_port %>
YARN_RESOURCEMANAGER_OPTS="-Dcom.sun.management.jmxremote.port=<%=
@resourcemanager_jmxremote_port %> -Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
-<% else -%>
-#export YARN_RESOURCEMANAGER_OPTS=
+<% end -%>
+
+<% if @yarn_resourcemanager_opts -%>
+YARN_RESOURCEMANAGER_OPTS="$YARN_RESOURCEMANAGER_OPTS <%=
@yarn_resourcemanager_opts %>"
<% end -%>
@@ -78,8 +80,10 @@
<% if @nodemanager_jmxremote_port -%>
# Enable YARN NodeManager JMX connections on port <%=
@nodemanager_jmxremote_port %>
YARN_NODEMANAGER_OPTS="-Dcom.sun.management.jmxremote.port=<%=
@nodemanager_jmxremote_port %> -Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
-<% else -%>
-#export YARN_NODEMANAGER_OPTS=
+<% end -%>
+
+<% if @yarn_nodemanager_opts -%>
+YARN_NODEMANAGER_OPTS="$YARN_NODEMANAGER_OPTS <%= @yarn_nodemanager_opts %>"
<% end -%>
# so that filenames w/ spaces are handled correctly in loops below
--
To view, visit https://gerrit.wikimedia.org/r/347353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic67e44225dbbdbe6c2e3b27986e505296812ddf6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Elukey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
