This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1586c74 AMBARI-23580 : Failed to stop AMS components after
Ambari-only upgrade.
1586c74 is described below
commit 1586c740503b1d57e939937ea6a492052a260987
Author: Aravindan Vijayan <avija...@hortonworks.com>
AuthorDate: Fri Apr 13 21:16:21 2018 -0700
AMBARI-23580 : Failed to stop AMS components after Ambari-only upgrade.
---
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 16 +++++++++++++---
.../0.1.0/package/templates/metric_monitor.ini.j2 | 2 +-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 17f2310..5126b77 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -316,7 +316,7 @@ user_group =
config['configurations']['cluster-env']["user_group"]
hadoop_user = "hadoop"
kinit_path_local =
functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths',
None))
-kinit_cmd = ""
+monitor_kinit_cmd = ""
klist_path_local =
functions.get_klist_path(default('/configurations/kerberos-env/executable_search_paths',
None))
klist_cmd = ""
@@ -344,8 +344,18 @@ if security_enabled:
regionserver_keytab_path =
config['configurations']['ams-hbase-security-site']['hbase.regionserver.keytab.file']
regionserver_jaas_princ =
config['configurations']['ams-hbase-security-site']['hbase.regionserver.kerberos.principal'].replace('_HOST',_hostname_lowercase)
- kinit_cmd = '%s -kt %s %s' % (kinit_path_local,
config['configurations']['ams-hbase-security-site']['ams.monitor.keytab'],
config['configurations']['ams-hbase-security-site']['ams.monitor.principal'].replace('_HOST',_hostname_lowercase))
- klist_cmd = '%s' % klist_path_local
+ # Monitor SPNEGO configs
+ ams_monitor_keytab = None
+ if (('ams-hbase-security-site' in config['configurations']) and
('ams.monitor.keytab' in config['configurations']['ams-hbase-security-site'])):
+ ams_monitor_keytab =
config['configurations']['ams-hbase-security-site']['ams.monitor.keytab']
+
+ ams_monitor_principal = None
+ if (('ams-hbase-security-site' in config['configurations']) and
('ams.monitor.principal' in
config['configurations']['ams-hbase-security-site'])):
+ ams_monitor_principal =
config['configurations']['ams-hbase-security-site']['ams.monitor.principal']
+
+ if ams_monitor_keytab and ams_monitor_principal:
+ monitor_kinit_cmd = '%s -kt %s %s' % (kinit_path_local,
ams_monitor_keytab, ams_monitor_principal.replace('_HOST',_hostname_lowercase))
+ klist_cmd = '%s' % klist_path_local
#Ambari metrics log4j settings
ams_hbase_log_maxfilesize =
default('configurations/ams-hbase-log4j/ams_hbase_log_maxfilesize',256)
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
index 6256eaa..ee90a4f 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
@@ -30,7 +30,7 @@ set.instanceId={{set_instanceId}}
[emitter]
send_interval = {{metrics_report_interval}}
-kinit_cmd = {{kinit_cmd}}
+kinit_cmd = {{monitor_kinit_cmd}}
klist_cmd = {{klist_cmd}}
[collector]
--
To stop receiving notification emails like this one, please contact
avija...@apache.org.
