Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393611 )
Change subject: Remove journalnode's config auto-inclusion from cdh::hadoop
......................................................................
Remove journalnode's config auto-inclusion from cdh::hadoop
This change should separate cdh::hadoop's configuration from
the management of the HDFS journalnode daemon, that should be
handled/instanciated separely.
Bug: T167790
Change-Id: Ifc285ac41ee7af1d622292a0cb69edb081b2a09d
---
M README.md
M manifests/hadoop.pp
2 files changed, 3 insertions(+), 16 deletions(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index 4e7b146..cea1b39 100644
--- a/README.md
+++ b/README.md
@@ -124,10 +124,9 @@
Namenode Automatic failover is enabled and configured automatically simply
setting
```zookeeper_hosts``` and configuring the JournalNodes.
-Your JournalNodes will be automatically configured based on the value of
-```$cdh::hadoop::journalnode_hosts```. When ```cdh::hadoop``` is included,
-if the current hostname or IP address matches a value in the $journalnode_hosts
-array, then ```cdh::hadoop::journalnode``` will be included.
+Your JournalNodes will not be automatically configured based on the value of
+```$cdh::hadoop::journalnode_hosts```, but ```cdh::hadoop::journalnode```
should
+be specifically instanciated where needed.
Before applying ```cdh::hadoop::journalnode```, make sure the
```dfs_journalnode_edits_dir``` is partitioned and mounted on each of the hosts
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 8fee325..48b22aa 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -323,7 +323,6 @@
content => template('cdh/hadoop/yarn-env.sh.erb'),
}
-
# Render hadoop-metrics2.properties
# if we have Ganglia Hosts to send metrics to.
$hadoop_metrics2_ensure = $ganglia_hosts ? {
@@ -333,16 +332,5 @@
file { "${config_directory}/hadoop-metrics2.properties":
ensure => $hadoop_metrics2_ensure,
content => template('cdh/hadoop/hadoop-metrics2.properties.erb'),
- }
-
- # If the current node is meant to be JournalNode,
- # include the journalnode class. JournalNodes can
- # be started at any time.
- if ($journalnode_hosts and (
- ($::fqdn and $::fqdn in $journalnode_hosts) or
- ($::ipaddress and $::ipaddress in $journalnode_hosts) or
- ($::ipaddress_eth1 and $::ipaddress_eth1 in $journalnode_hosts)))
- {
- include cdh::hadoop::journalnode
}
}
--
To view, visit https://gerrit.wikimedia.org/r/393611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc285ac41ee7af1d622292a0cb69edb081b2a09d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
