Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298558
Change subject: Adding how long to wait between aggregated log retention checks
......................................................................
Adding how long to wait between aggregated log retention checks
Checking daily whether logs need to be deleted
Bug: T139178
Change-Id: I3f29acbde2dba5c1443fc754a80b0beaacfc0342
---
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/58/298558/1
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 9c903ad..c3e4437 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -100,6 +100,7 @@
# If
yarn.log-aggregation.retain-check-interval-seconds is not set
# or set to 0 or a negative
value (default) then the check interval is
# one-tenth of the aggregated
log retention time.
+# $yarn_log_aggregation_retain_check_interval_seconds - How long to wait
between aggregated log retention checks.
#
# $hadoop_heapsize - -Xmx for NameNode and
DataNode. Default: undef
# $hadoop_namenode_opts - Any additional opts to pass to
NameNode node on startup. Default: undef
@@ -167,6 +168,7 @@
$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_log_aggregation_retain_seconds =
$::cdh::hadoop::defaults::yarn_log_aggregation_retain_seconds,
+ $yarn_log_aggregation_retain_check_interval_seconds =
$::cdh::hadoop::defaults::yarn_log_aggregation_retain_check_interval_seconds,
$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,
$yarn_scheduler_minimum_allocation_vcores =
$::cdh::hadoop::defaults::yarn_scheduler_minimum_allocation_vcores,
diff --git a/manifests/hadoop/defaults.pp b/manifests/hadoop/defaults.pp
index ac9f430..395f1d9 100644
--- a/manifests/hadoop/defaults.pp
+++ b/manifests/hadoop/defaults.pp
@@ -55,6 +55,7 @@
$yarn_scheduler_maximum_allocation_vcores = undef
# logs would be retained for 3 months
$yarn_log_aggregation_retain_seconds = 7776000
+ $yarn_log_aggregation_retain_check_interval_seconds = 86400
$fair_scheduler_template =
'cdh/hadoop/fair-scheduler.xml.erb'
$yarn_site_extra_properties = undef
diff --git a/templates/hadoop/yarn-site.xml.erb
b/templates/hadoop/yarn-site.xml.erb
index 9573961..6d74484 100644
--- a/templates/hadoop/yarn-site.xml.erb
+++ b/templates/hadoop/yarn-site.xml.erb
@@ -270,6 +270,13 @@
</description>
</property>
+ <property>
+ <name>yarn.log-aggregation.retain-check-interval-seconds</name>
+ <value><%= @yarn_log_aggregation_retain_check_interval_seconds %></value>
+ <description>
+ How long to wait between aggregated log retention checks.
+ </description>
+ </property>
<% if @yarn_site_extra_properties -%>
<% @yarn_site_extra_properties.sort.map do |key, value| -%>
<property>
--
To view, visit https://gerrit.wikimedia.org/r/298558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f29acbde2dba5c1443fc754a80b0beaacfc0342
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Nuria <nu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
