Repository: ambari Updated Branches: refs/heads/branch-2.1 95a2ebf42 -> bbe4c9a1e
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/bbe4c9a1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bbe4c9a1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bbe4c9a1 Branch: refs/heads/branch-2.1 Commit: bbe4c9a1ec81d31d0511b68787c476ddc7bd5f12 Parents: 95a2ebf Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Nov 30 19:10:34 2015 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Mon Nov 30 19:20:46 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/bbe4c9a1/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 d71a172..cb4abaf 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -980,9 +980,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/bbe4c9a1/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 2229251..de77cc9 100644 --- a/ambari-web/test/controllers/main/host/details_test.js +++ b/ambari-web/test/controllers/main/host/details_test.js @@ -2675,7 +2675,7 @@ describe('App.MainHostDetailsController', function () { 'deleteHiveMetaStore': false, 'deleteWebHCatServer': false }, - 'hiveHosts': ['h1', 'h2'], + 'hiveHosts': ['h1', 'h2', 'h4'], 'title': 'adding HiveServer2' }, { @@ -2685,7 +2685,7 @@ describe('App.MainHostDetailsController', function () { 'deleteHiveMetaStore': false, 'deleteWebHCatServer': false }, - 'hiveHosts': ['h0', 'h1', 'h2'], + 'hiveHosts': ['h0', 'h1', 'h2', 'h4'], 'title': 'adding Hive Metastore' }, { @@ -2695,7 +2695,7 @@ describe('App.MainHostDetailsController', function () { 'deleteHiveMetaStore': false, 'deleteWebHCatServer': false }, - 'hiveHosts': ['h0', 'h1', 'h2'], + 'hiveHosts': ['h0', 'h1', 'h2', 'h4'], 'title': 'adding WebHCat Server' }, { @@ -2706,7 +2706,7 @@ describe('App.MainHostDetailsController', function () { 'deleteHiveMetaStore': true, 'deleteWebHCatServer': false }, - 'hiveHosts': ['h2'], + 'hiveHosts': ['h2', 'h4'], 'title': 'deleting Hive component' }, { @@ -2728,7 +2728,7 @@ describe('App.MainHostDetailsController', function () { 'deleteHiveMetaStore': false, 'deleteWebHCatServer': false }, - 'hiveHosts': ['h1'], + 'hiveHosts': ['h1', 'h4'], 'title': 'deleting host with Hive component' }, { @@ -2739,7 +2739,7 @@ describe('App.MainHostDetailsController', function () { 'deleteHiveMetaStore': false, 'deleteWebHCatServer': false }, - 'hiveHosts': ['h1'], + 'hiveHosts': ['h1', 'h4'], 'title': 'deleting host with WebHCat Server' } ];
