You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/02/23 19:02:38 UTC
[1/4] storm git commit: STORM-641. Add total number of topologies to
api/v1/cluster/summary.
Repository: storm
Updated Branches:
refs/heads/master bde305447 -> e6a29e07c
STORM-641. Add total number of topologies to api/v1/cluster/summary.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d8d73a2e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d8d73a2e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d8d73a2e
Branch: refs/heads/master
Commit: d8d73a2e095329c5eeda44255ba369e96c4c546f
Parents: 103de9a
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Mon Feb 2 16:37:15 2015 -0800
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Mon Feb 2 16:37:15 2015 -0800
----------------------------------------------------------------------
STORM-UI-REST-API.md | 3 ++-
storm-core/src/clj/backtype/storm/ui/core.clj | 20 +++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d8d73a2e/STORM-UI-REST-API.md
----------------------------------------------------------------------
diff --git a/STORM-UI-REST-API.md b/STORM-UI-REST-API.md
index 1671262..43938c5 100644
--- a/STORM-UI-REST-API.md
+++ b/STORM-UI-REST-API.md
@@ -73,7 +73,8 @@ Response fields:
|--- |--- |---
|stormVersion|String| Storm version|
|nimbusUptime|String| Shows how long the cluster is running|
-|supervisors|Integer| Number of supervisors running|
+|supervisors|Integer| Number of supervisors running|
+|topologies| Integer| Number of topologies running|
|slotsTotal| Integer|Total number of available worker slots|
|slotsUsed| Integer| Number of worker slots used|
|slotsFree| Integer |Number of worker slots available|
http://git-wip-us.apache.org/repos/asf/storm/blob/d8d73a2e/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 10a1123..b39ab27 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -491,19 +491,21 @@
(cluster-summary (.getClusterInfo ^Nimbus$Client nimbus) user)))
([^ClusterSummary summ user]
(let [sups (.get_supervisors summ)
- used-slots (reduce + (map #(.get_num_used_workers ^SupervisorSummary %) sups))
- total-slots (reduce + (map #(.get_num_workers ^SupervisorSummary %) sups))
- free-slots (- total-slots used-slots)
- total-tasks (->> (.get_topologies summ)
- (map #(.get_num_tasks ^TopologySummary %))
- (reduce +))
- total-executors (->> (.get_topologies summ)
- (map #(.get_num_executors ^TopologySummary %))
- (reduce +))]
+ used-slots (reduce + (map #(.get_num_used_workers ^SupervisorSummary %) sups))
+ total-slots (reduce + (map #(.get_num_workers ^SupervisorSummary %) sups))
+ free-slots (- total-slots used-slots)
+ topologies (.get_topologies_size summ)
+ total-tasks (->> (.get_topologies summ)
+ (map #(.get_num_tasks ^TopologySummary %))
+ (reduce +))
+ total-executors (->> (.get_topologies summ)
+ (map #(.get_num_executors ^TopologySummary %))
+ (reduce +))]
{"user" user
"stormVersion" (str (VersionInfo/getVersion))
"nimbusUptime" (pretty-uptime-sec (.get_nimbus_uptime_secs summ))
"supervisors" (count sups)
+ "topologies" topologies
"slotsTotal" total-slots
"slotsUsed" used-slots
"slotsFree" free-slots
[2/4] storm git commit: Merge branch 'STORM-641' of
https://github.com/harshach/incubator-storm into STORM-641
Posted by sr...@apache.org.
Merge branch 'STORM-641' of https://github.com/harshach/incubator-storm into STORM-641
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e0475e41
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e0475e41
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e0475e41
Branch: refs/heads/master
Commit: e0475e411794a6e60a7cefac34eec24820e15f10
Parents: a8eab50 d8d73a2
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sat Feb 21 12:34:12 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sat Feb 21 12:34:12 2015 -0800
----------------------------------------------------------------------
STORM-UI-REST-API.md | 3 ++-
storm-core/src/clj/backtype/storm/ui/core.clj | 20 +++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e0475e41/STORM-UI-REST-API.md
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e0475e41/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
[3/4] storm git commit: Added STORM-641 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-641 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2de52742
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2de52742
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2de52742
Branch: refs/heads/master
Commit: 2de5274268580b56214f70878dfb5afc61227e95
Parents: e0475e4
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Feb 23 08:31:17 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Feb 23 08:31:17 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2de52742/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c7ebb1..8120d82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0
+ * STORM-641: Add total number of topologies to api/v1/cluster/summary.
* STORM-640: Storm UI vulnerable to poodle attack.
* STORM-651: improvements to storm.cmd
* STORM-456: Storm UI: cannot navigate to topology page when name contains spaces.
[4/4] storm git commit: Merge branch 'STORM-641'
Posted by sr...@apache.org.
Merge branch 'STORM-641'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e6a29e07
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e6a29e07
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e6a29e07
Branch: refs/heads/master
Commit: e6a29e07c9863db6b885465d6cbf57168f6a1e6c
Parents: bde3054 2de5274
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Feb 23 09:47:14 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Feb 23 09:47:14 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
STORM-UI-REST-API.md | 3 ++-
storm-core/src/clj/backtype/storm/ui/core.clj | 20 +++++++++++---------
3 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e6a29e07/CHANGELOG.md
----------------------------------------------------------------------