瀏覽代碼

BUG-8655 After NameNode HA is enabled, HDFS Summary should show which NameNode is Active/Standby in HDFS Summary

aBabiichuk 11 年之前
父節點
當前提交
7f9d0582fd
共有 3 個文件被更改,包括 14 次插入20 次删除
  1. 2 0
      ambari-web/app/messages.js
  2. 9 0
      ambari-web/app/utils/ajax.js
  3. 3 20
      ambari-web/app/views/main/dashboard/service/hdfs.js

+ 2 - 0
ambari-web/app/messages.js

@@ -878,6 +878,8 @@ Em.I18n.translations = {
   'services.service.summary.RegionServersLIVE':'RegionServers Live',
   'services.service.summary.GangliaMonitorsLIVE':'Ganglia Monitors Live',
   'services.service.summary.nameNode':'NameNode Web UI',
+  'services.service.summary.nameNode.active':'Active NameNode',
+  'services.service.summary.nameNode.standby':'Standby NameNode',
   'services.service.summary.nameNodeUptime':'NameNode Uptime',
   'services.service.summary.nameNodeHeap':'NameNode Heap',
   'services.service.summary.nameNode.active':'Active NameNode',

+ 9 - 0
ambari-web/app/utils/ajax.js

@@ -572,6 +572,15 @@ var urls = {
     'mock': '',
     'type': 'GET'
   },
+  'admin.high_availability.getNnCheckPointStatus.sync': {
+    'real': '/clusters/{clusterName}/hosts/{hostName}/host_components/NAMENODE',
+    'mock': '',
+    'format': function (data, opt) {
+      return {
+        async: false
+      };
+    }
+  },
   'admin.high_availability.getJnCheckPointStatus': {
     'real': '/clusters/{clusterName}/hosts/{hostName}/host_components/JOURNALNODE?fields=metrics',
     'mock': ''

+ 3 - 20
ambari-web/app/views/main/dashboard/service/hdfs.js

@@ -218,25 +218,8 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     return App.HostComponent.find().findProperty('componentName', 'JOURNALNODE');
   }.property(),
 
-  safeModeStatus: function () {
+  isSafeMode: function () {
     var safeMode = this.get('service.safeModeStatus');
-    if (safeMode == null) {
-      return Em.I18n.t("services.service.summary.notAvailable");
-    } else if (safeMode.length == 0) {
-      return Em.I18n.t("services.service.summary.safeModeStatus.notInSafeMode");
-    } else {
-      return Em.I18n.t("services.service.summary.safeModeStatus.inSafeMode");
-    }
-  }.property('service.safeModeStatus'),
-  upgradeStatus: function () {
-    var upgradeStatus = this.get('service.upgradeStatus');
-    var healthStatus = this.get('service.healthStatus');
-    if (upgradeStatus) {
-      return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notPending');
-    } else if (healthStatus == 'green') {
-      return Em.I18n.t('services.service.summary.pendingUpgradeStatus.pending');
-    } else {
-      return Em.I18n.t("services.service.summary.notAvailable");
-    }
-  }.property('service.upgradeStatus', 'service.healthStatus')
+    return safeMode != null && safeMode.length > 0;
+  }.property('service.safeModeStatus')
 });