You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mg...@apache.org on 2018/03/28 17:17:53 UTC
[ambari] branch trunk updated: AMBARI-23386 HSI Jdbc URL should
handle HA mode (mgergely)
This is an automated email from the ASF dual-hosted git repository.
mgergely 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 074c01f AMBARI-23386 HSI Jdbc URL should handle HA mode (mgergely)
074c01f is described below
commit 074c01ffbdec8b11ddfac78cfa41ee4f86ac60a0
Author: Miklos Gergely <mg...@hortonworks.com>
AuthorDate: Wed Mar 21 15:44:13 2018 +0100
AMBARI-23386 HSI Jdbc URL should handle HA mode (mgergely)
---
.../app/controllers/main/service/info/summary.js | 18 +++++++++++-------
ambari-web/app/messages.js | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js
index 3d7483a..ec76417 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -252,23 +252,27 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
}
var hiveSiteDynamicDiscovery = configs[0].properties['hive.server2.support.dynamic.service.discovery'];
- var hiveSiteZkNameSpace = configs[0].properties['hive.server2.zookeeper.namespace'];
- var hiveSiteZkQuorom = configs[0].properties['hive.zookeeper.quorum'];
-
+ var hiveSiteZkQuorom = configs[0].properties['hive.zookeeper.quorum'];
+ var hiveSiteServiceDiscorveryMode = 'zooKeeper';
+ var hiveSiteZkNameSpace = configs[0].properties['hive.server2.zookeeper.namespace'];
configs.forEach(function(_config) {
var masterComponent = App.MasterComponent.find().findProperty('componentName', siteToComponentMap[_config.type]);
if (_config.type === 'hive-interactive-site') {
- hiveSiteDynamicDiscovery = _config.properties['hive.server2.support.dynamic.service.discovery'] || hiveSiteDynamicDiscovery;
- hiveSiteZkQuorom = _config.properties['hive.zookeeper.quorum'] || hiveSiteZkQuorom;
- hiveSiteZkNameSpace = _config.properties['hive.server2.zookeeper.namespace'] || hiveSiteZkNameSpace;
+ hiveSiteDynamicDiscovery = _config.properties['hive.server2.support.dynamic.service.discovery'] || hiveSiteDynamicDiscovery;
+ hiveSiteZkQuorom = _config.properties['hive.zookeeper.quorum'] || hiveSiteZkQuorom;
+ hiveSiteZkNameSpace = _config.properties['hive.server2.zookeeper.namespace'] || hiveSiteZkNameSpace;
+ if (_config.properties['hive.server2.active.passive.ha.enable'] === 'true') {
+ hiveSiteServiceDiscorveryMode = 'zooKeeperHA';
+ hiveSiteZkNameSpace = _config.properties['hive.server2.active.passive.ha.registry.namespace'];
+ }
}
if (masterComponent && !!masterComponent.get('totalCount')) {
var hiveEndPoint = {
isVisible: hiveSiteDynamicDiscovery,
componentName: masterComponent.get('componentName'),
label: masterComponent.get('displayName') + Em.I18n.t('services.service.summary.hiveserver2.jdbc.url.text'),
- value: Em.I18n.t('services.service.summary.hiveserver2.endpoint.value').format(hiveSiteZkQuorom, hiveSiteZkNameSpace),
+ value: Em.I18n.t('services.service.summary.hiveserver2.endpoint.value').format(hiveSiteZkQuorom, hiveSiteServiceDiscorveryMode, hiveSiteZkNameSpace),
tooltipText: Em.I18n.t('services.service.summary.hiveserver2.endpoint.tooltip.text').format(masterComponent.get('displayName'))
};
self.get('hiveServerEndPoints').pushObject(Em.Object.create(hiveEndPoint));
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 40e8101..3efe86a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2040,7 +2040,7 @@ Em.I18n.translations = {
'services.service.summary.historyServer': 'History Server Web UI',
'services.service.summary.hiveserver2.jdbc.url.text': ' JDBC URL',
'services.service.summary.hiveserver2.endpoint.tooltip.text':'JDBC connection string for {0}',
- 'services.service.summary.hiveserver2.endpoint.value':'jdbc:hive2://{0}/;serviceDiscoveryMode=zooKeeper;zooKeeperNamespace={1}',
+ 'services.service.summary.hiveserver2.endpoint.value':'jdbc:hive2://{0}/;serviceDiscoveryMode={1};zooKeeperNamespace={2}',
'services.service.actions.downloadClientConfigs':'Download Client Configs',
'services.service.actions.downloadClientConfigs.fail.noConfigFile':'No configuration files defined for the component',
'services.service.actions.downloadClientConfigs.fail.popup.header':'{0} Configs',
--
To stop receiving notification emails like this one, please contact
mgergely@apache.org.