ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-14116. hadoop.proxyuser.hcat.hosts contains only 2 of 3 WebHcat hosts (onechiporenko)
Date Mon, 30 Nov 2015 17:17:12 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 78bef69aa -> 61abd869b


AMBARI-14116. hadoop.proxyuser.hcat.hosts contains only 2 of 3 WebHcat hosts (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61abd869
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61abd869
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61abd869

Branch: refs/heads/trunk
Commit: 61abd869b64eae39b77aa5da143034887dca3875
Parents: 78bef69
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Mon Nov 30 19:10:34 2015 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Mon Nov 30 19:10:34 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host/details.js       |  3 +++
 ambari-web/test/controllers/main/host/details_test.js | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/61abd869/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index c3713fc..ea1a168 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -955,9 +955,12 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
   getHiveHosts: function () {
     var
       hiveHosts = App.HostComponent.find().filterProperty('componentName', 'HIVE_METASTORE').mapProperty('hostName'),
+      webhcatHosts = App.HostComponent.find().filterProperty('componentName', 'WEBHCAT_SERVER').mapProperty('hostName'),
       hiveMetastoreHost = this.get('hiveMetastoreHost'),
       webhcatServerHost = this.get('webhcatServerHost');
 
+    hiveHosts = hiveHosts.concat(webhcatHosts).uniq();
+
     if (!!hiveMetastoreHost) {
       hiveHosts.push(hiveMetastoreHost);
       this.set('hiveMetastoreHost', '');

http://git-wip-us.apache.org/repos/asf/ambari/blob/61abd869/ambari-web/test/controllers/main/host/details_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js
index f0a2874..c5cf548 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -2981,7 +2981,7 @@ describe('App.MainHostDetailsController', function () {
           'deleteHiveMetaStore': false,
           'deleteWebHCatServer': false
         },
-        'hiveHosts': ['h1', 'h2'],
+        'hiveHosts': ['h1', 'h2', 'h4'],
         'title': 'adding HiveServer2'
       },
       {
@@ -2991,7 +2991,7 @@ describe('App.MainHostDetailsController', function () {
           'deleteHiveMetaStore': false,
           'deleteWebHCatServer': false
         },
-        'hiveHosts': ['h0', 'h1', 'h2'],
+        'hiveHosts': ['h0', 'h1', 'h2', 'h4'],
         'title': 'adding Hive Metastore'
       },
       {
@@ -3001,7 +3001,7 @@ describe('App.MainHostDetailsController', function () {
           'deleteHiveMetaStore': false,
           'deleteWebHCatServer': false
         },
-        'hiveHosts': ['h0', 'h1', 'h2'],
+        'hiveHosts': ['h0', 'h1', 'h2', 'h4'],
         'title': 'adding WebHCat Server'
       },
       {
@@ -3012,7 +3012,7 @@ describe('App.MainHostDetailsController', function () {
           'deleteHiveMetaStore': true,
           'deleteWebHCatServer': false
         },
-        'hiveHosts': ['h2'],
+        'hiveHosts': ['h2', 'h4'],
         'title': 'deleting Hive component'
       },
       {
@@ -3034,7 +3034,7 @@ describe('App.MainHostDetailsController', function () {
           'deleteHiveMetaStore': false,
           'deleteWebHCatServer': false
         },
-        'hiveHosts': ['h1'],
+        'hiveHosts': ['h1', 'h4'],
         'title': 'deleting host with Hive component'
       },
       {
@@ -3045,7 +3045,7 @@ describe('App.MainHostDetailsController', function () {
           'deleteHiveMetaStore': false,
           'deleteWebHCatServer': false
         },
-        'hiveHosts': ['h1'],
+        'hiveHosts': ['h1', 'h4'],
         'title': 'deleting host with WebHCat Server'
       }
     ];


Mime
View raw message