Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192651
Change subject: Parameterize yarn.nodemanager.resource.cpu-vcores, default to
$::processorcount - 1
......................................................................
Parameterize yarn.nodemanager.resource.cpu-vcores, default to $::processorcount
- 1
Change-Id: I431f382a7dda5b373e7f72b003fad6f47559471a
---
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M templates/hadoop/yarn-site.xml.erb
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh
refs/changes/51/192651/1
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 4363311..ae148cf 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -63,6 +63,7 @@
# $mapreduce_output_compession_type - Whether to output compress on
BLOCK or RECORD level.
# Default: RECORD
# $yarn_nodemanager_resource_memory_mb
+# $yarn_nodemanager_resource_cpu_vcores - Default: $::processorcount - 1
# $yarn_scheduler_minimum_allocation_mb - The minimum allocation for
every container request at the RM,
# in MBs. Memory requests lower
than this won't take effect, and
# the specified value will get
allocated at minimum.
@@ -127,6 +128,7 @@
$mapreduce_output_compression_codec =
$::cdh::hadoop::defaults::mapreduce_output_compession_codec,
$mapreduce_output_compression_type =
$::cdh::hadoop::defaults::mapreduce_output_compression_type,
$yarn_nodemanager_resource_memory_mb =
$::cdh::hadoop::defaults::yarn_nodemanager_resource_memory_mb,
+ $yarn_nodemanager_resource_cpu_vcores =
$::cdh::hadoop::defaults::yarn_nodemanager_resource_cpu_vcores,
$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,
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index 7ebff5b..4c3cae1 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -39,6 +39,7 @@
$mapreduce_output_compression_type = 'RECORD'
$yarn_nodemanager_resource_memory_mb = undef
+ $yarn_nodemanager_resource_cpu_vcores = $::processorcount - 1
$yarn_scheduler_minimum_allocation_mb = undef
$yarn_scheduler_maximum_allocation_mb = undef
diff --git a/templates/hadoop/yarn-site.xml.erb
b/templates/hadoop/yarn-site.xml.erb
index c230e2e..9a66b92 100644
--- a/templates/hadoop/yarn-site.xml.erb
+++ b/templates/hadoop/yarn-site.xml.erb
@@ -84,6 +84,13 @@
</property>
<% end -%>
+<% if @yarn_nodemanager_resource_cpu_vcores -%>
+ <property>
+ <name>yarn.nodemanager.resource.cpu-vcores</name>
+ <value><%= @yarn_nodemanager_resource_cpu_vcores %></value>
+ </property>
+<% end -%>
+
<% if @yarn_scheduler_minimum_allocation_mb -%>
<property>
<name>yarn.scheduler.minimum-allocation-mb</name>
--
To view, visit https://gerrit.wikimedia.org/r/192651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I431f382a7dda5b373e7f72b003fad6f47559471a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
