You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/01 22:40:43 UTC
[12/24] git commit: remove ui topology action
remove ui topology action
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/0427e06e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/0427e06e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/0427e06e
Branch: refs/heads/master
Commit: 0427e06e52776b1f4e4ad299d198ee7a1384bae6
Parents: b3191fc
Author: JuDasheng <ju...@meituan.com>
Authored: Wed Jun 11 23:00:02 2014 +0800
Committer: JuDasheng <ju...@meituan.com>
Committed: Wed Jun 11 23:00:02 2014 +0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 74 +++++++++++-----------
storm-core/src/ui/public/topology.html | 6 +-
storm-dist/binary/pom.xml | 2 +-
3 files changed, 42 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0427e06e/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 5f2bcba..4098038 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -780,43 +780,43 @@
(let [id (url-decode id)
component (url-decode component)]
(json-response (component-page id component (:window m) (check-include-sys? (:sys m))))))
- (POST "/api/v1/topology/:id/activate" [id]
- (with-nimbus nimbus
- (let [id (url-decode id)
- tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
- name (.get_name tplg)]
- (.activate nimbus name)
- (log-message "Activating topology '" name "'")))
- (resp/redirect (str "/api/v1/topology/" id)))
-
- (POST "/api/v1/topology/:id/deactivate" [id]
- (with-nimbus nimbus
- (let [id (url-decode id)
- tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
- name (.get_name tplg)]
- (.deactivate nimbus name)
- (log-message "Deactivating topology '" name "'")))
- (resp/redirect (str "/api/v1/topology/" id)))
- (POST "/api/v1/topology/:id/rebalance/:wait-time" [id wait-time]
- (with-nimbus nimbus
- (let [id (url-decode id)
- tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
- name (.get_name tplg)
- options (RebalanceOptions.)]
- (.set_wait_secs options (Integer/parseInt wait-time))
- (.rebalance nimbus name options)
- (log-message "Rebalancing topology '" name "' with wait time: " wait-time " secs")))
- (resp/redirect (str "/api/v1/topology/" id)))
- (POST "/api/v1/topology/:id/kill/:wait-time" [id wait-time]
- (with-nimbus nimbus
- (let [id (url-decode id)
- tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
- name (.get_name tplg)
- options (KillOptions.)]
- (.set_wait_secs options (Integer/parseInt wait-time))
- (.killTopologyWithOpts nimbus name options)
- (log-message "Killing topology '" name "' with wait time: " wait-time " secs")))
- (resp/redirect (str "/api/v1/topology/" id)))
+ ;(POST "/api/v1/topology/:id/activate" [id]
+ ; (with-nimbus nimbus
+ ; (let [id (url-decode id)
+ ; tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ ; name (.get_name tplg)]
+ ; (.activate nimbus name)
+ ; (log-message "Activating topology '" name "'")))
+ ; (resp/redirect (str "/api/v1/topology/" id)))
+
+ ;(POST "/api/v1/topology/:id/deactivate" [id]
+ ; (with-nimbus nimbus
+ ; (let [id (url-decode id)
+ ; tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ ; name (.get_name tplg)]
+ ; (.deactivate nimbus name)
+ ; (log-message "Deactivating topology '" name "'")))
+ ; (resp/redirect (str "/api/v1/topology/" id)))
+ ;(POST "/api/v1/topology/:id/rebalance/:wait-time" [id wait-time]
+ ; (with-nimbus nimbus
+ ; (let [id (url-decode id)
+ ; tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ ; name (.get_name tplg)
+ ; options (RebalanceOptions.)]
+ ; (.set_wait_secs options (Integer/parseInt wait-time))
+ ; (.rebalance nimbus name options)
+ ; (log-message "Rebalancing topology '" name "' with wait time: " wait-time " secs")))
+ ; (resp/redirect (str "/api/v1/topology/" id)))
+ ;(POST "/api/v1/topology/:id/kill/:wait-time" [id wait-time]
+ ; (with-nimbus nimbus
+ ; (let [id (url-decode id)
+ ; tplg (.getTopologyInfo ^Nimbus$Client nimbus id)
+ ; name (.get_name tplg)
+ ; options (KillOptions.)]
+ ; (.set_wait_secs options (Integer/parseInt wait-time))
+ ; (.killTopologyWithOpts nimbus name options)
+ ; (log-message "Killing topology '" name "' with wait time: " wait-time " secs")))
+ ; (resp/redirect (str "/api/v1/topology/" id)))
(GET "/" [:as {cookies :cookies}]
(resp/redirect "/index.html"))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0427e06e/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/topology.html b/storm-core/src/ui/public/topology.html
index df095ad..9cb08cd 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -19,11 +19,13 @@
<h2>Topology summary</h2>
<div id="topology-summary">
</div>
+<!--
<div id="topology-actions">
<h2 class="js-only">Topology actions</h2>
<p id="topology-actions" class="js-only">
</p>
</div>
+-->
<div id="topology-stats"></div>
<div id="spout-stats">
</div>
@@ -60,13 +62,13 @@ $(document).ready(function() {
var spoutStats = $("#spout-stats");
var boltStats = $("#bolt-stats");
var config = $("#topology-configuration");
- var topologyActions = $("#topology-actions");
+ //var topologyActions = $("#topology-actions");
var topologyVisualization = $("#topology-visualization")
var formattedConfig = formatConfigData(response["configuration"]);
var buttonJsonData = topologyActionJson(response["id"],response["name"],response["status"],response["msgTimeout"]);
$.get("/templates/topology-page-template.html", function(template) {
topologySummary.append(Mustache.render($(template).filter("#topology-summary-template").html(),response));
- topologyActions.append(Mustache.render($(template).filter("#topology-actions-template").html(),buttonJsonData));
+ //topologyActions.append(Mustache.render($(template).filter("#topology-actions-template").html(),buttonJsonData));
topologyStats.append(Mustache.render($(template).filter("#topology-stats-template").html(),response));
$("#topology-stats-table").tablesorter({ sortList: [[0,0]], headers: {0: { sorter: "stormtimestr"}}});
spoutStats.append(Mustache.render($(template).filter("#spout-stats-template").html(),response));
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0427e06e/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 4fa3a27..bb1b876 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.2-incubating-SNAPSHOT</version>
+ <version>0.9.2-incubating-mt0000</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>