You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/04/15 13:20:58 UTC
ambari git commit: AMBARI-10474. NFSGateways have incorrect
displaying at UI. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 7262f985d -> 899fe99f1
AMBARI-10474. NFSGateways have incorrect displaying at UI. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/899fe99f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/899fe99f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/899fe99f
Branch: refs/heads/trunk
Commit: 899fe99f140b21ffb527b59571763898713e13cc
Parents: 7262f98
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Apr 14 20:19:34 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Apr 15 14:20:20 2015 +0300
----------------------------------------------------------------------
.../app/mappers/components_state_mapper.js | 5 ++++
.../app/mappers/service_metrics_mapper.js | 5 +++-
.../templates/main/service/services/hdfs.hbs | 26 ++++++++++----------
.../app/views/main/service/services/hdfs.js | 7 ------
4 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/899fe99f/ambari-web/app/mappers/components_state_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/components_state_mapper.js b/ambari-web/app/mappers/components_state_mapper.js
index 37128fe..ee3bccf 100644
--- a/ambari-web/app/mappers/components_state_mapper.js
+++ b/ambari-web/app/mappers/components_state_mapper.js
@@ -48,6 +48,11 @@ App.componentsStateMapper = App.QuickDataMapper.create({
data_nodes_installed: 'INSTALLED_PATH',
data_nodes_total: 'TOTAL_PATH'
},
+ 'NFS_GATEWAY': {
+ nfs_gateways_started: 'STARTED_PATH',
+ nfs_gateways_installed: 'INSTALLED_PATH',
+ nfs_gateways_total: 'TOTAL_PATH'
+ },
'NODEMANAGER': {
node_managers_started: 'STARTED_PATH',
node_managers_installed: 'INSTALLED_PATH',
http://git-wip-us.apache.org/repos/asf/ambari/blob/899fe99f/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index a2189bb..f6e0756 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -65,7 +65,10 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
name_node_rpc: 'nameNodeComponent.host_components[0].metrics.rpc.RpcQueueTime_avg_time',
data_nodes_started: 'data_nodes_started',
data_nodes_installed: 'data_nodes_installed',
- data_nodes_total: 'data_nodes_total'
+ data_nodes_total: 'data_nodes_total',
+ nfs_gateways_started: 'nfs_gateways_started',
+ nfs_gateways_installed: 'nfs_gateways_installed',
+ nfs_gateways_total: 'nfs_gateways_total'
},
yarnConfig: {
version: 'resourceManagerComponent.ServiceComponentInfo.Version',
http://git-wip-us.apache.org/repos/asf/ambari/blob/899fe99f/ambari-web/app/templates/main/service/services/hdfs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs b/ambari-web/app/templates/main/service/services/hdfs.hbs
index 5c93dfe..9319490 100644
--- a/ambari-web/app/templates/main/service/services/hdfs.hbs
+++ b/ambari-web/app/templates/main/service/services/hdfs.hbs
@@ -29,6 +29,18 @@
{{t common.started}}
</td>
</tr>
+<!-- NFS Gateway -->
+<tr>
+ <td><a href="#" {{action filterHosts view.nfsGatewayComponent}}>{{t dashboard.services.hdfs.nfsgateways}}</a></td>
+ <td>
+ <span>
+ {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.nfsGatewaysStarted" totalComponentsBinding="view.service.nfsGatewaysTotal"}}
+ {{view.liveComponents}}/{{view.totalComponents}}
+ {{/view}}
+ </span>
+ {{t common.started}}
+ </td>
+</tr>
<!-- Data Node Counts -->
<tr>
<td>{{t dashboard.services.hdfs.datanodecounts}}</td>
@@ -115,16 +127,4 @@
<td>
{{view.safeModeStatus}}
</td>
-</tr>
-<!-- NFS Gateway -->
-<tr>
- <td><a href="#" {{action filterHosts view.nfsGatewayComponent}}>{{t dashboard.services.hdfs.nfsgateways}}</a></td>
- <!--td>
- <span>
- {{#view App.ComponentLiveTextView liveComponentsBinding="view.service.nfsGatewaysStarted" totalComponentsBinding="view.service.nfsGatewaysTotal"}}
- {{view.liveComponents}}/{{view.totalComponents}}
- {{/view}}
- </span>
- {{t common.started}}
- </td-->
-</tr>
+</tr>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/899fe99f/ambari-web/app/views/main/service/services/hdfs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/services/hdfs.js b/ambari-web/app/views/main/service/services/hdfs.js
index 518c493..01f1ee8 100644
--- a/ambari-web/app/views/main/service/services/hdfs.js
+++ b/ambari-web/app/views/main/service/services/hdfs.js
@@ -70,13 +70,6 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
return this.get('service.dataNodesInstalled');
}.property('service.dataNodesInstalled'),
- nfsGatewaysLive: function () {
- return this.get('service.nfsGatewaysStarted');
- }.property('service.nfsGatewaysStarted'),
- nfsGatewaysDead: function () {
- return this.get('service.nfsGatewaysInstalled');
- }.property('service.nfsGatewaysInstalled'),
-
showJournalNodes: function () {
return this.get('service.journalNodes.length') > 0;
}.property('service.journalNodes.length'),