You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2016/04/22 02:20:22 UTC
ambari git commit: AMBARI-16018. Namenode RPC widget on Ambari
Dashboard shows n/a. (alexantonenko via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 9c1427150 -> e508c2244
AMBARI-16018. Namenode RPC widget on Ambari Dashboard shows n/a. (alexantonenko via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e508c224
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e508c224
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e508c224
Branch: refs/heads/trunk
Commit: e508c2244684b590aaafa2547e8a5db61e125ecf
Parents: 9c14271
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Apr 21 17:19:37 2016 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Apr 21 17:19:37 2016 -0700
----------------------------------------------------------------------
.../data/dashboard/HDP2/master_components.json | 6 +++--
.../data/dashboard/services_multi_hosts.json | 26 +++++++++++---------
.../assets/data/services/metrics/hdfs/rpc.json | 6 +++--
.../data/widget_layouts/HDFS_SUMMARY.json | 2 +-
.../app/controllers/global/update_controller.js | 2 +-
.../app/mappers/service_metrics_mapper.js | 2 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
7 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/dashboard/HDP2/master_components.json b/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
index e3bd190..e47bcc7 100644
--- a/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
+++ b/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
@@ -1,5 +1,5 @@
{
- "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/?ServiceComponentInfo/category=MASTER&fields=ServiceComponentInfo/MasterActiveTime,host_components/metrics/jvm/memHeapUsedM,host_components/metrics/jvm/memHeapCommittedM,host_components/metrics/mapred/jobtracker/trackers_decommissioned,host_components/metrics/cpu/cpu_wio,host_components/metrics/rpc/RpcQueueTime_avg_time,host_components/metrics/dfs/FSNamesystem/HAState,host_components/metrics/dfs/FSNamesystem/CapacityUsed,host_components/metrics/dfs/FSNamesystem/CapacityTotal,host_components/metrics/dfs/FSNamesystem/CapacityRemaining,host_components/metrics/dfs/FSNamesystem/BlocksTotal,host_components/metrics/dfs/FSNamesystem/CorruptBlocks,host_components/metrics/dfs/FSNamesystem/MissingBlocks,host_components/metrics/dfs/FSNamesystem/UnderReplicatedBlocks,host_components/metrics/dfs/namenode/Version,host_components/metrics/dfs/namenode/LiveNodes,host_components/metrics/dfs/namenode/DeadNodes,host_components/metric
s/dfs/namenode/DecomNodes,host_components/metrics/dfs/namenode/TotalFiles,host_components/metrics/dfs/namenode/UpgradeFinalized,host_components/metrics/dfs/namenode/Safemode,host_components/metrics/runtime/StartTime,host_components/metrics/flume/flume,host_components/metrics/yarn/Queue,host_components/metrics/hbase/master/IsActiveMaster,host_components/HostRoles/state",
+ "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/?ServiceComponentInfo/category=MASTER&fields=ServiceComponentInfo/MasterActiveTime,host_components/metrics/jvm/memHeapUsedM,host_components/metrics/jvm/memHeapCommittedM,host_components/metrics/mapred/jobtracker/trackers_decommissioned,host_components/metrics/cpu/cpu_wio,host_components/metrics/rpc/client/RpcQueueTime_avg_time,host_components/metrics/dfs/FSNamesystem/HAState,host_components/metrics/dfs/FSNamesystem/CapacityUsed,host_components/metrics/dfs/FSNamesystem/CapacityTotal,host_components/metrics/dfs/FSNamesystem/CapacityRemaining,host_components/metrics/dfs/FSNamesystem/BlocksTotal,host_components/metrics/dfs/FSNamesystem/CorruptBlocks,host_components/metrics/dfs/FSNamesystem/MissingBlocks,host_components/metrics/dfs/FSNamesystem/UnderReplicatedBlocks,host_components/metrics/dfs/namenode/Version,host_components/metrics/dfs/namenode/LiveNodes,host_components/metrics/dfs/namenode/DeadNodes,host_components
/metrics/dfs/namenode/DecomNodes,host_components/metrics/dfs/namenode/TotalFiles,host_components/metrics/dfs/namenode/UpgradeFinalized,host_components/metrics/dfs/namenode/Safemode,host_components/metrics/runtime/StartTime,host_components/metrics/flume/flume,host_components/metrics/yarn/Queue,host_components/metrics/hbase/master/IsActiveMaster,host_components/HostRoles/state",
"items" : [
{
"ServiceComponentInfo" : {
@@ -164,7 +164,9 @@
"memHeapUsedM" : 106.43069
},
"rpc" : {
- "RpcQueueTime_avg_time" : 0.0
+ "client": {
+ "RpcQueueTime_avg_time" : 0.0
+ }
},
"runtime" : {
"StartTime" : 1383649085429
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/dashboard/services_multi_hosts.json b/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
index 824a806..0e05499 100644
--- a/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
+++ b/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
@@ -342,18 +342,20 @@
"proc_run" : 2.86944444444
},
"rpc" : {
- "rpcAuthorizationSuccesses" : 0.0861111111111,
- "SentBytes" : 106.391481481,
- "rpcAuthorizationFailures" : 0.0,
- "ReceivedBytes" : 229.217407407,
- "NumOpenConnections" : 0.0,
- "callQueueLen" : 0.0,
- "rpcAuthenticationSuccesses" : 0.0,
- "RpcQueueTime_num_ops" : 0.748703703704,
- "RpcProcessingTime_num_ops" : 0.748703703704,
- "RpcProcessingTime_avg_time" : 0.110499338624,
- "rpcAuthenticationFailures" : 0.0,
- "RpcQueueTime_avg_time" : 0.323186728395
+ "client": {
+ "rpcAuthorizationSuccesses" : 0.0861111111111,
+ "SentBytes" : 106.391481481,
+ "rpcAuthorizationFailures" : 0.0,
+ "ReceivedBytes" : 229.217407407,
+ "NumOpenConnections" : 0.0,
+ "callQueueLen" : 0.0,
+ "rpcAuthenticationSuccesses" : 0.0,
+ "RpcQueueTime_num_ops" : 0.748703703704,
+ "RpcProcessingTime_num_ops" : 0.748703703704,
+ "RpcProcessingTime_avg_time" : 0.110499338624,
+ "rpcAuthenticationFailures" : 0.0,
+ "RpcQueueTime_avg_time" : 0.323186728395
+ }
},
"ugi" : {
"loginFailure_num_ops" : 0.0,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/ambari-web/app/assets/data/services/metrics/hdfs/rpc.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/services/metrics/hdfs/rpc.json b/ambari-web/app/assets/data/services/metrics/hdfs/rpc.json
index f0e1827..0b3d3b4 100644
--- a/ambari-web/app/assets/data/services/metrics/hdfs/rpc.json
+++ b/ambari-web/app/assets/data/services/metrics/hdfs/rpc.json
@@ -1,5 +1,5 @@
{
- "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[1351117114,1351120714,60]",
+ "href" : "http://ambari/clusters/SrimanthAmbari/hosts/hostname/host_components/NAMENODE?fields=metrics/rpc/client/RpcQueueTime_avg_time[1351117114,1351120714,60]",
"HostRoles" : {
"cluster_name" : "SrimanthAmbari",
"component_name" : "NAMENODE",
@@ -10,7 +10,9 @@
},
"metrics" : {
"rpc" : {
- "RpcQueueTime_avg_time" : "[[0.055987654321,1351117440],[0.013271604938,1351117800],[0.0046296296296,1351118160],[0.018518518519,1351118520],[0.01712962963,1351118880],[0.0,1351119240],[0.0,1351119600],[0.0,1351119960],[0.0,1351120320],[0.0095679012346,1351120680],[0.018672839506,1351121040]]"
+ "client": {
+ "RpcQueueTime_avg_time" : "[[0.055987654321,1351117440],[0.013271604938,1351117800],[0.0046296296296,1351118160],[0.018518518519,1351118520],[0.01712962963,1351118880],[0.0,1351119240],[0.0,1351119600],[0.0,1351119960],[0.0,1351120320],[0.0095679012346,1351120680],[0.018672839506,1351121040]]"
+ }
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json b/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json
index e55d104..c76737f 100644
--- a/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json
+++ b/ambari-web/app/assets/data/widget_layouts/HDFS_SUMMARY.json
@@ -79,7 +79,7 @@
{
"WidgetInfo" : {
"id" : 8,
- "metrics" : "[{\"name\":\"Hadoop:service\\u003dNameNode,name\\u003dRpcActivity.RpcQueueTimeAvgTime\",\"metric_path\":\"metrics/rpc/RpcQueueTime_avg_time\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"}]",
+ "metrics" : "[{\"name\":\"Hadoop:service\\u003dNameNode,name\\u003dRpcActivity.RpcQueueTimeAvgTime\",\"metric_path\":\"metrics/rpc/client/RpcQueueTime_avg_time\",\"service_name\":\"HDFS\",\"component_name\":\"NAMENODE\",\"host_component_criteria\":\"host_components/metrics/dfs/FSNamesystem/HAState\\u003dactive\"}]",
"author" : "ambari",
"description" : null,
"scope" : "CLUSTER",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index 757d353..c8bea6b 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -44,7 +44,7 @@ App.UpdateController = Em.Controller.extend({
'host_components/metrics/jvm/memHeapCommittedM',
'host_components/metrics/mapred/jobtracker/trackers_decommissioned',
'host_components/metrics/cpu/cpu_wio',
- 'host_components/metrics/rpc/RpcQueueTime_avg_time',
+ 'host_components/metrics/rpc/client/RpcQueueTime_avg_time',
'host_components/metrics/dfs/FSNamesystem/*',
'host_components/metrics/dfs/namenode/Version',
'host_components/metrics/dfs/namenode/LiveNodes',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/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 2e15973..1733382 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -65,7 +65,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
upgrade_status: 'nameNodeComponent.host_components[0].metrics.dfs.namenode.UpgradeFinalized',
safe_mode_status: 'nameNodeComponent.host_components[0].metrics.dfs.namenode.Safemode',
name_node_cpu: 'nameNodeComponent.host_components[0].metrics.cpu.cpu_wio',
- name_node_rpc: 'nameNodeComponent.host_components[0].metrics.rpc.RpcQueueTime_avg_time',
+ name_node_rpc: 'nameNodeComponent.host_components[0].metrics.rpc.client.RpcQueueTime_avg_time',
data_nodes_started: 'data_nodes_started',
data_nodes_installed: 'data_nodes_installed',
data_nodes_total: 'data_nodes_total',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508c224/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 72364f0..1cb70c5 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1159,7 +1159,7 @@ var urls = {
'testInProduction': true
},
'service.metrics.hdfs.rpc': {
- 'real': '/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/rpc/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'real': '/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/rpc/client/RpcQueueTime_avg_time[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/services/metrics/hdfs/rpc.json',
'testInProduction': true
},