Updated Branches: refs/heads/trunk ce5f62edd -> d436c3a1b
AMBARI-3472 HBase Service Summary and Host Detail page: add support for multiple HBase Masters. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/d436c3a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/d436c3a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/d436c3a1 Branch: refs/heads/trunk Commit: d436c3a1bdf8bfba9f96dac623dfbc16751d27ea Parents: ce5f62e Author: aBabiichuk <[email protected]> Authored: Mon Oct 7 19:01:46 2013 +0300 Committer: aBabiichuk <[email protected]> Committed: Mon Oct 7 19:01:46 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/mappers/status_mapper.js | 6 ++++++ ambari-web/app/messages.js | 2 ++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d436c3a1/ambari-web/app/mappers/status_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/status_mapper.js b/ambari-web/app/mappers/status_mapper.js index 307af35..885779a 100644 --- a/ambari-web/app/mappers/status_mapper.js +++ b/ambari-web/app/mappers/status_mapper.js @@ -159,6 +159,12 @@ App.statusMapper = App.QuickDataMapper.create({ hostComponent.set('displayNameAdvanced', null); } } + } else if(hostComponent.get('componentName') === 'HBASE_MASTER') { + if (hostComponent.get('workStatus') === 'STARTED') { + hostComponent.get('haStatus') == 'active' ? hostComponent.set('displayNameAdvanced', this.t('dashboard.services.hbase.masterServer.active')) : hostComponent.set('displayNameAdvanced', this.t('dashboard.services.hbase.masterServer.standby')); + } else { + hostComponent.set('displayNameAdvanced', null); + } } if (hostComponent.get("displayNameAdvanced")) { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d436c3a1/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 8cb0abf..908ebb3 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1445,6 +1445,8 @@ Em.I18n.translations = { 'dashboard.services.hbase.summary':'{0} region servers with {1} average load', 'dashboard.services.hbase.masterServer':'HBase Master', + 'dashboard.services.hbase.masterServer.active':'Active HBase Master', + 'dashboard.services.hbase.masterServer.standby':'Standby HBase Master', 'dashboard.services.hbase.noMasterServer':'No Active Master', 'dashboard.services.hbase.masterServerHeap':'Master Heap', 'dashboard.services.hbase.masterServerHeap.summary':'{0} / {1} ({2}% used)',
