Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/297799
Change subject: Include hive::client role in hadoop::worker role to get
hive-site.xml and other deps
......................................................................
Include hive::client role in hadoop::worker role to get hive-site.xml and other
deps
Change-Id: Ia8a59b8b0143111d4a59cae168776f8561ebd510
---
M manifests/site.pp
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
2 files changed, 6 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/297799/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 4b73dee..9af4617 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -93,15 +93,7 @@
# This is used for Hadoop network topology awareness.
# Please also update the analytics_hadoop_hosts Hiera variable.
node /analytics10(2[89]|3[0-9]|4[0-9]|5[0-7]).eqiad.wmnet/ {
-
- # Test including hive::client role on analytics1030.
- # We may need this for Hive-spark in cluster mode.
- if $::hostname == 'analytics1030' {
- role analytics_cluster::hadoop::worker, analytics_cluster::hive::client
- }
- else {
- role analytics_cluster::hadoop::worker
- }
+ role analytics_cluster::hadoop::worker
include base::firewall
include standard
diff --git a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
index 3746758..d8013a7 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
@@ -55,12 +55,13 @@
}
}
- # Install hive-hcatalog package on worker nodes to get
+ # hive::client is nice to have for jobs launched
+ # from random worker nodes as app masters so they
+ # have access to hive-site.xml and other hive jars.
+ # This installs hive-hcatalog package on worker nodes to get
# hcatalog jars, including Hive JsonSerde for using
# JSON backed Hive tables.
- if $::hostname != 'analytics1030' {
- require_package('hive-hcatalog')
- }
+ include role::analytics_cluster::hive::client
# Spark Python stopped working in Spark 1.5.0 with Oozie,
# for complicated reasons. We need to be able to set
--
To view, visit https://gerrit.wikimedia.org/r/297799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8a59b8b0143111d4a59cae168776f8561ebd510
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
