You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/01/18 16:50:59 UTC
ambari git commit: AMBARI-9189. UI for supporting HiveServer 2 HA
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 968c4b9de -> b3f0afbfc
AMBARI-9189. UI for supporting HiveServer 2 HA (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3f0afbf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3f0afbf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3f0afbf
Branch: refs/heads/trunk
Commit: b3f0afbfcc3f09d189ab6493d972711c442bd19e
Parents: 968c4b9
Author: Alex Antonenko <hi...@gmail.com>
Authored: Sun Jan 18 15:39:30 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sun Jan 18 15:39:30 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/item.js | 2 +-
ambari-web/app/messages.js | 1 +
ambari-web/app/models/stack_service_component.js | 2 +-
ambari-web/app/views/main/service/item.js | 7 +++++++
4 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3f0afbf/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 3f5b880..c8dbf92 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -52,7 +52,7 @@ App.MainServiceItemController = Em.Controller.extend({
var hostNames = App.Host.find().mapProperty('hostName');
this.set('allHosts', hostNames);
- ['HBASE_MASTER', 'HIVE_METASTORE', 'ZOOKEEPER_SERVER', 'FLUME_HANDLER'].forEach(function(componentName) {
+ ['HBASE_MASTER', 'HIVE_METASTORE', 'ZOOKEEPER_SERVER', 'FLUME_HANDLER', 'HIVE_SERVER'].forEach(function(componentName) {
self.loadHostsWithoutComponent(componentName);
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3f0afbf/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bfb6250..c97f334 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2295,6 +2295,7 @@ Em.I18n.translations = {
'dashboard.services.hive.clients':'Hive Clients',
'dashboard.services.hive.client':'Hive Client',
'dashboard.services.hive.metastore':'Hive Metastore',
+ 'dashboard.services.hive.server2':'HiveServer2',
'dashboard.services.oozie.clients':'Oozie Clients',
'dashboard.services.oozie.client':'Oozie Client',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3f0afbf/ambari-web/app/models/stack_service_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js
index 770195a..1867cc1 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -190,7 +190,7 @@ App.StackServiceComponent = DS.Model.extend({
/** @property {Boolean} showAddBtnInInstall - show add button for this component on Assign Masters **/
showAddBtnInInstall: function() {
- var doNotShowList = ['HIVE_METASTORE'];
+ var doNotShowList = ['HIVE_METASTORE', 'HIVE_SERVER'];
return !doNotShowList.contains(this.get('componentName'));
}.property('componentName')
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3f0afbf/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index 7d307cc..4143d03 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -162,6 +162,13 @@ App.MainServiceItemView = Em.View.extend({
isHidden: !App.get('isHadoop22Stack')
},
{
+ cssClass: 'icon-plus',
+ 'label': '{0} {1}'.format(Em.I18n.t('add'), Em.I18n.t('dashboard.services.hive.server2')),
+ service: 'HIVE',
+ component: 'HIVE_SERVER',
+ isHidden: !App.get('isHadoop22Stack')
+ },
+ {
cssClass: 'icon-plus',
'label': '{0} {1}'.format(Em.I18n.t('add'), Em.I18n.t('dashboard.services.zookeeper.server')),
service: 'ZOOKEEPER',