Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404954 )
Change subject: Allow to set the JAVA_HOME env variable in hadoop/hive/oozie
......................................................................
Allow to set the JAVA_HOME env variable in hadoop/hive/oozie
Bug: T166248
Change-Id: I58a0ce3e7610e21a72493571830b2a2c105e9ada
---
M modules/profile/manifests/hadoop/common.pp
M modules/profile/manifests/hive/client.pp
M modules/profile/manifests/oozie/server.pp
3 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/hadoop/common.pp
b/modules/profile/manifests/hadoop/common.pp
index eb03376..afe5e07 100644
--- a/modules/profile/manifests/hadoop/common.pp
+++ b/modules/profile/manifests/hadoop/common.pp
@@ -119,6 +119,9 @@
# Yarn scheduler specific setting.
# Default: undef
#
+# [*java_home*]
+# Sets the JAVA_HOME env. variable in hadoop-env.sh
+#
class profile::hadoop::common (
$zookeeper_clusters = hiera('zookeeper_clusters'),
$zookeeper_cluster_name =
hiera('profile::hadoop::common::zookeeper_cluster_name'),
@@ -148,6 +151,7 @@
$yarn_scheduler_maximum_allocation_mb =
hiera('profile::hadoop::common::yarn_scheduler_maximum_allocation_mb', undef),
$yarn_scheduler_minimum_allocation_vcores =
hiera('profile::hadoop::common::yarn_scheduler_minimum_allocation_vcores',
undef),
$yarn_scheduler_maximum_allocation_vcores =
hiera('profile::hadoop::common::yarn_scheduler_maximum_allocation_vcores',
undef),
+ $java_home =
hiera('profile::hadoop::common::java_home', undef),
) {
# Include Wikimedia's thirdparty/cloudera apt component
# as an apt source on all Hadoop hosts. This is needed
@@ -255,6 +259,8 @@
# > 200G free.
'yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage'
=> '99.0',
},
+
+ java_home => $java_home,
}
class { '::ores::base': }
diff --git a/modules/profile/manifests/hive/client.pp
b/modules/profile/manifests/hive/client.pp
index b8edb60..4e676a5 100644
--- a/modules/profile/manifests/hive/client.pp
+++ b/modules/profile/manifests/hive/client.pp
@@ -10,6 +10,7 @@
$metastore_host =
hiera('profile::hive::client::hive_metastore_host'),
$hive_server_opts = hiera('profile::hive::client::hive_server_opts',
undef),
$hive_metastore_opts =
hiera('profile::hive::client::hive_metastore_opts', undef),
+ $java_home = hiera('profile::hive::client::java_home', undef),
) {
require ::profile::hadoop::common
@@ -38,6 +39,7 @@
hive_server_opts => $hive_server_opts,
hive_metastore_opts => $hive_metastore_opts,
metastore_host => $metastore_host,
+ java_home => $java_home,
}
# Set up a wrapper script for beeline, the command line
diff --git a/modules/profile/manifests/oozie/server.pp
b/modules/profile/manifests/oozie/server.pp
index 161543b..5738e3d 100644
--- a/modules/profile/manifests/oozie/server.pp
+++ b/modules/profile/manifests/oozie/server.pp
@@ -6,6 +6,7 @@
$monitoring_enabled = hiera('profile::oozie::server::monitoring_enabled',
false),
$ferm_srange = hiera('profile::oozie::server::ferm_srange',
'$DOMAIN_NETWORKS'),
$jvm_opts = hiera('profile::oozie::server::jvm_opts',
'-Xmx2048m'),
+ $java_home = hiera('profile::oozie::server::java_home', undef)
) {
require ::profile::oozie::client
@@ -29,6 +30,7 @@
# settings look like they are properly configured.
authorization_service_authorization_enabled => false,
jvm_opts => $jvm_opts,
+ java_home => $java_home,
}
# Oozie is creating event logs in /var/log/oozie.
--
To view, visit https://gerrit.wikimedia.org/r/404954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58a0ce3e7610e21a72493571830b2a2c105e9ada
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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
