You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/10/30 22:17:57 UTC
[06/12] storm git commit: Update the RESTful API doc for topology
summary
Update the RESTful API doc for topology summary
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2ef1414c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2ef1414c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2ef1414c
Branch: refs/heads/master
Commit: 2ef1414cc0088dfea3f8e7396fc621de8d19d783
Parents: 3688fa8
Author: zhuol <zh...@yahoo-inc.com>
Authored: Fri Oct 30 14:55:23 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Fri Oct 30 14:55:23 2015 -0500
----------------------------------------------------------------------
STORM-UI-REST-API.md | 17 +++++++++++++++++
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
.../ui/public/templates/index-page-template.html | 2 +-
.../public/templates/topology-page-template.html | 6 +++---
4 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2ef1414c/STORM-UI-REST-API.md
----------------------------------------------------------------------
diff --git a/STORM-UI-REST-API.md b/STORM-UI-REST-API.md
index 62167fb..f081337 100644
--- a/STORM-UI-REST-API.md
+++ b/STORM-UI-REST-API.md
@@ -189,6 +189,15 @@ Response fields:
|workersTotal| Integer |Number of workers used for this topology|
|executorsTotal| Integer |Number of executors used for this topology|
|replicationCount| Integer |Number of nimbus hosts on which this topology code is replicated|
+|requestedMemOnHeap| Double|Requested On-Heap Memory by User (MB)
+|requestedMemOffHeap| Double|Requested Off-Heap Memory by User (MB)|
+|requestedTotalMem| Double|Requested Total Memory by User (MB)|
+|requestedCpu| Double|Requested CPU by User (%)|
+|assignedMemOnHeap| Double|Assigned On-Heap Memory by Scheduler (MB)|
+|assignedMemOffHeap| Double|Assigned Off-Heap Memory by Scheduler (MB)|
+|assignedTotalMem| Double|Assigned Total Memory by Scheduler (MB)|
+|assignedCpu| Double|Assigned CPU by Scheduler (%)|
+
Sample response:
```json
@@ -204,6 +213,14 @@ Sample response:
"workersTotal": 3,
"executorsTotal": 28,
"replicationCount": 1
+ "requestedMemOnHeap": 640
+ "requestedMemOffHeap": 128
+ "requestedTotalMem": 768
+ "requestedCpu": 80
+ "assignedMemOnHeap": 640
+ "assignedMemOffHeap": 128
+ "assignedTotalMem": 768
+ "assignedCpu": 80
}
]
}
http://git-wip-us.apache.org/repos/asf/storm/blob/2ef1414c/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index aaaeef0..9bfe76d 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -415,7 +415,7 @@
"assignedMemOnHeap" (.get_assigned_memonheap t)
"assignedMemOffHeap" (.get_assigned_memoffheap t)
"assignedTotalMem" (+ (.get_assigned_memonheap t) (.get_assigned_memoffheap t))
- "assignedTotalCpu" (.get_assigned_cpu t)})}))
+ "assignedCpu" (.get_assigned_cpu t)})}))
(defn topology-stats [window stats]
(let [times (stats-times (:emitted stats))
http://git-wip-us.apache.org/repos/asf/storm/blob/2ef1414c/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html
index a5a885b..5005f8d 100644
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@ -178,7 +178,7 @@
<td>{{tasksTotal}}</td>
<td>{{replicationCount}}</td>
<td>{{assignedTotalMem}}</td>
- <td>{{assignedTotalCpu}}</td>
+ <td>{{assignedCpu}}</td>
<td>{{schedulerInfo}}</td>
</tr>
{{/topologies}}
http://git-wip-us.apache.org/repos/asf/storm/blob/2ef1414c/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/storm-core/src/ui/public/templates/topology-page-template.html
index 537f105..00e4fa2 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -101,7 +101,7 @@
</span>
</th>
<th>
- <span data-toggle="tooltip" data-placement="above" title="Requested Total On-Heap Memory by Scheduler.">
+ <span data-toggle="tooltip" data-placement="above" title="Requested Total On-Heap Memory by User.">
Requested On-Heap Memory (MB)
</span>
</th>
@@ -111,7 +111,7 @@
</span>
</th>
<th>
- <span data-toggle="tooltip" data-placement="above" title="Requested Total Off-Heap Memory by Scheduler.">
+ <span data-toggle="tooltip" data-placement="above" title="Requested Total Off-Heap Memory by User.">
Requested Off-Heap Memory (MB)
</span>
</th>
@@ -121,7 +121,7 @@
</span>
</th>
<th>
- <span data-toggle="tooltip" data-placement="above" title="Requested Total CPU by Scheduler. Every 100 means 1 core.">
+ <span data-toggle="tooltip" data-placement="above" title="Requested Total CPU by User. Every 100 means 1 core.">
Requested CPU (%)
</span>
</th>