ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-14810 When their are multiple Job History Servers in the cluster, QuickLinks should show the URL for all instances. (atkach)
Date Wed, 27 Jan 2016 15:59:12 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f4edad887 -> 54311b788


AMBARI-14810 When their are multiple Job History Servers in the cluster, QuickLinks should
show the URL for all instances. (atkach)


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

Branch: refs/heads/trunk
Commit: 54311b78863219e5702873e7d9ac94a942210ea9
Parents: f4edad8
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Wed Jan 27 15:35:40 2016 +0200
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Wed Jan 27 15:35:40 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/views/common/quick_view_link_view.js  | 3 +++
 ambari-web/test/views/common/quick_link_view_test.js | 5 +++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/54311b78/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index 5b26201..c2f7dcc 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -538,6 +538,9 @@ App.QuickViewLinks = Em.View.extend({
       case "ATLAS":
         hosts = this.findHosts('ATLAS_SERVER', response);
         break;
+      case "MAPREDUCE2":
+        hosts = this.findHosts('HISTORYSERVER', response);
+        break;
       default:
         if (this.getWithDefault('content.hostComponents', []).someProperty('isMaster')) {
           hosts = this.findHosts(this.get('content.hostComponents').findProperty('isMaster').get('componentName'),
response);

http://git-wip-us.apache.org/repos/asf/ambari/blob/54311b78/ambari-web/test/views/common/quick_link_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/quick_link_view_test.js b/ambari-web/test/views/common/quick_link_view_test.js
index f619e87..93a235c 100644
--- a/ambari-web/test/views/common/quick_link_view_test.js
+++ b/ambari-web/test/views/common/quick_link_view_test.js
@@ -945,6 +945,11 @@ describe('App.QuickViewLinks', function () {
       expect(quickViewLinks.findHosts.calledWith('ATLAS_SERVER', {})).to.be.true;
     });
 
+    it("MAPREDUCE2 service", function() {
+      expect(quickViewLinks.getHosts({}, 'MAPREDUCE2')).to.eql(['host1']);
+      expect(quickViewLinks.findHosts.calledWith('HISTORYSERVER', {})).to.be.true;
+    });
+
     it("custom service without master", function() {
       expect(quickViewLinks.getHosts({}, 'S1')).to.be.empty;
     });


Mime
View raw message