You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sa...@apache.org on 2017/03/22 06:04:58 UTC
[1/5] storm git commit: Enable/disable Debug button on UI if
eventloggers are enabled. Also show tooltip on Debug button
Repository: storm
Updated Branches:
refs/heads/master c722940b6 -> e3204bc16
Enable/disable Debug button on UI if eventloggers are enabled. Also show tooltip on Debug button
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f0a52862
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f0a52862
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f0a52862
Branch: refs/heads/master
Commit: f0a52862e340dde5849d06fd7984e0d308f14291
Parents: 17783d5
Author: Roshan Naik <ro...@hortonworks.com>
Authored: Wed Mar 30 16:30:43 2016 -0700
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Tue Mar 21 10:45:00 2017 +0530
----------------------------------------------------------------------
storm-core/src/ui/public/js/script.js | 4 ++--
storm-core/src/ui/public/templates/topology-page-template.html | 2 +-
storm-core/src/ui/public/topology.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f0a52862/storm-core/src/ui/public/js/script.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js
index 886c34b..0f1f6ae 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -211,7 +211,7 @@ function renderToggleSys(div) {
}
}
-function topologyActionJson(id, encodedId, name, status, msgTimeout, debug, samplingPct) {
+function topologyActionJson(id, encodedId, name, status, msgTimeout, loggersTotal, debug, samplingPct) {
var jsonData = {};
jsonData["id"] = id;
jsonData["encodedId"] = encodedId;
@@ -221,7 +221,7 @@ function topologyActionJson(id, encodedId, name, status, msgTimeout, debug, samp
jsonData["deactivateStatus"] = (status === "ACTIVE") ? "enabled" : "disabled";
jsonData["rebalanceStatus"] = (status === "ACTIVE" || status === "INACTIVE" ) ? "enabled" : "disabled";
jsonData["killStatus"] = (status !== "KILLED") ? "enabled" : "disabled";
- jsonData["startDebugStatus"] = (status === "ACTIVE" && !debug) ? "enabled" : "disabled";
+ jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=null && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
jsonData["stopDebugStatus"] = (status === "ACTIVE" && debug) ? "enabled" : "disabled";
jsonData["currentSamplingPct"] = samplingPct;
return jsonData;
http://git-wip-us.apache.org/repos/asf/storm/blob/f0a52862/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 2f7238a..95d0ad4 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -616,7 +616,7 @@
<input {{deactivateStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'deactivate', false)" type="button" value="Deactivate" class="btn btn-default">
<input {{rebalanceStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'rebalance', true, {{msgTimeout}}, 'wait time in seconds')" type="button" value="Rebalance" class="btn btn-default">
<input {{killStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'kill', true, 30, 'wait time in seconds')" type="button" value="Kill" class="btn btn-default">
- <input {{startDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default">
+ <input {{startDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default" style="pointer-events:all; cursor: default;" title="To debug, set topology.eventlogger.executors > 0">
<input {{stopDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/disable', false, 0, 'sampling percentage', 'stop debugging')" type="button" value="Stop Debug" class="btn btn-default">
<input type="button" {{logLevel}} value="Change Log Level" onclick="toggleChangeLogLevel()" class="btn btn-default">
</p>
http://git-wip-us.apache.org/repos/asf/storm/blob/f0a52862/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 a0070f8..0c10e16 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -293,7 +293,7 @@ $(document).ready(function() {
var searchForm = $("#search-form")
var formattedConfig = formatConfigData(response["configuration"]);
var buttonJsonData = topologyActionJson(response["id"],response["encodedId"],response["name"],response["status"]
- ,response["msgTimeout"],response["debug"],response["samplingPct"]);
+ ,response["msgTimeout"],response["configuration"]["topology.eventlogger.executors"],response["debug"],response["samplingPct"]);
$.ajax ({url: "/templates/topology-page-template.html", success: function(template) {
toggleChangeLogLevel = function (data) {
renderLogLevelForm (template, data);
[5/5] storm git commit: Added STORM-2427 to CHANGELOG.md
Posted by sa...@apache.org.
Added STORM-2427 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e3204bc1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e3204bc1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e3204bc1
Branch: refs/heads/master
Commit: e3204bc16ce87a2cf7e0e6370f616c02fcd78e96
Parents: 34aea04
Author: Satish Duggana <sa...@apache.org>
Authored: Wed Mar 22 10:08:02 2017 +0530
Committer: Satish Duggana <sa...@apache.org>
Committed: Wed Mar 22 10:08:02 2017 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e3204bc1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3463571..5401f33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 2.0.0
+ * STORM-2427: Fix event logger enable disable UI buttons
* STORM-2425: Storm Hive Bolt not closing open transactions
* STORM-2409: Storm-Kafka-Client KafkaSpout Support for Failed and NullTuples
* STORM-2423: Join Bolt should use explicit instead of default window anchoring for emitted tuples
[2/5] storm git commit: Showing tooltip on Debug button only when
disabled and event loggers are disabled. Also enable/disable of Debug button
along with toltip in component page
Posted by sa...@apache.org.
Showing tooltip on Debug button only when disabled and event loggers are disabled. Also enable/disable of Debug button along with toltip in component page
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3186330e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3186330e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3186330e
Branch: refs/heads/master
Commit: 3186330e6a6e2565972751cc28a87f307797b8ba
Parents: f0a5286
Author: Roshan Naik <ro...@hortonworks.com>
Authored: Thu Mar 31 18:16:52 2016 -0700
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Tue Mar 21 10:45:09 2017 +0530
----------------------------------------------------------------------
storm-core/src/ui/public/component.html | 18 +++++++++++++++++-
storm-core/src/ui/public/js/script.js | 6 ++++--
.../public/templates/component-page-template.html | 8 +++++++-
.../public/templates/topology-page-template.html | 8 +++++++-
4 files changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3186330e/storm-core/src/ui/public/component.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/component.html b/storm-core/src/ui/public/component.html
index 0cde4db..942b12d 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -198,10 +198,26 @@ $(document).ready(function() {
$('#ui-user [data-toggle="tooltip"]').tooltip()
});
+ var topologyUrl = "/api/v1/topology/"+topologyId;
+
+ var eventLoggers = (function() {
+ $.ajaxSetup({
+ async: false
+ });
+ var eventLoggers;
+ $.getJSON(topologyUrl, function(response, status, jqXHR) {
+ eventLoggers = response["configuration"]["topology.eventlogger.executors"];
+ });
+ $.ajaxSetup({
+ async: true
+ })
+ return eventLoggers;
+ })();
+
var componentSummary = $("#component-summary");
var componentActions = $("#component-actions");
var buttonJsonData = componentActionJson(response["encodedTopologyId"], response["encodedId"], response["id"],
- response["topologyStatus"], response["debug"], response["samplingPct"]);
+ response["topologyStatus"], eventLoggers, response["debug"], response["samplingPct"]);
var componentStatsDetail = $("#component-stats-detail")
var inputStats = $("#component-input-stats");
var outputStats = $("#component-output-stats");
http://git-wip-us.apache.org/repos/asf/storm/blob/3186330e/storm-core/src/ui/public/js/script.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js
index 0f1f6ae..8b59f65 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -223,17 +223,19 @@ function topologyActionJson(id, encodedId, name, status, msgTimeout, loggersTota
jsonData["killStatus"] = (status !== "KILLED") ? "enabled" : "disabled";
jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=null && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
jsonData["stopDebugStatus"] = (status === "ACTIVE" && debug) ? "enabled" : "disabled";
+ jsonData["loggersDisabled"] = loggersTotal==null || loggersTotal==0;
jsonData["currentSamplingPct"] = samplingPct;
return jsonData;
}
-function componentActionJson(encodedTopologyId, encodedId, componentName, status, debug, samplingPct) {
+function componentActionJson(encodedTopologyId, encodedId, componentName, status, loggersTotal, debug, samplingPct) {
var jsonData = {};
jsonData["encodedTopologyId"] = encodedTopologyId;
jsonData["encodedId"] = encodedId;
jsonData["componentName"] = componentName;
- jsonData["startDebugStatus"] = (status === "ACTIVE" && !debug) ? "enabled" : "disabled";
+ jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=null && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
jsonData["stopDebugStatus"] = (status === "ACTIVE" && debug) ? "enabled" : "disabled";
+ jsonData["loggersDisabled"] = loggersTotal==null || loggersTotal==0;
jsonData["currentSamplingPct"] = samplingPct;
return jsonData;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/3186330e/storm-core/src/ui/public/templates/component-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/component-page-template.html b/storm-core/src/ui/public/templates/component-page-template.html
index 634ef47..c1f3a19 100644
--- a/storm-core/src/ui/public/templates/component-page-template.html
+++ b/storm-core/src/ui/public/templates/component-page-template.html
@@ -579,7 +579,13 @@
<script id="component-actions-template" type="text/html">
<h2>Component actions</h2>
<p id="component-actions">
- <input {{startDebugStatus}} onclick="confirmComponentAction('{{encodedTopologyId}}', '{{encodedId}}', '{{componentName}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default">
+ {{#loggersDisabled}}
+ <span style="display:inline-block;" data-toggle="tooltip" title="" data-original-title="To debug, set topology.eventlogger.executors to a value > 0">
+ {{/loggersDisabled}}
+ <input {{startDebugStatus}} onclick="confirmComponentAction('{{encodedTopologyId}}', '{{encodedId}}', '{{componentName}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default">
+ {{#loggersDisabled}}
+ </span>
+ {{/loggersDisabled}}
<input {{stopDebugStatus}} onclick="confirmComponentAction('{{encodedTopologyId}}', '{{encodedId}}', '{{componentName}}', 'debug/disable', false, 0, 'sampling percentage', 'stop debugging')" type="button" value="Stop Debug" class="btn btn-default">
</p>
</script>
http://git-wip-us.apache.org/repos/asf/storm/blob/3186330e/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 95d0ad4..2106d6c 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -616,7 +616,13 @@
<input {{deactivateStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'deactivate', false)" type="button" value="Deactivate" class="btn btn-default">
<input {{rebalanceStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'rebalance', true, {{msgTimeout}}, 'wait time in seconds')" type="button" value="Rebalance" class="btn btn-default">
<input {{killStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'kill', true, 30, 'wait time in seconds')" type="button" value="Kill" class="btn btn-default">
- <input {{startDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default" style="pointer-events:all; cursor: default;" title="To debug, set topology.eventlogger.executors > 0">
+ {{#loggersDisabled}}
+ <span style="display:inline-block;" data-toggle="tooltip" title="" data-original-title="To debug, set topology.eventlogger.executors to a value > 0">
+ {{/loggersDisabled}}
+ <input {{startDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/enable', true, {{currentSamplingPct}}, 'sampling percentage', 'debug')" type="button" value="Debug" class="btn btn-default" >
+ {{#loggersDisabled}}
+ </span>
+ {{/loggersDisabled}}
<input {{stopDebugStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'debug/disable', false, 0, 'sampling percentage', 'stop debugging')" type="button" value="Stop Debug" class="btn btn-default">
<input type="button" {{logLevel}} value="Change Log Level" onclick="toggleChangeLogLevel()" class="btn btn-default">
</p>
[3/5] storm git commit: Remove loggersTotal != null check as it
implies 1 eventlogger per worker
Posted by sa...@apache.org.
Remove loggersTotal != null check as it implies 1 eventlogger per worker
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b1ee165c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b1ee165c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b1ee165c
Branch: refs/heads/master
Commit: b1ee165c68ecb6e8f50993c4181a70ff011da145
Parents: 3186330
Author: Arun Mahadevan <ar...@apache.org>
Authored: Tue Mar 21 10:48:11 2017 +0530
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Tue Mar 21 10:48:11 2017 +0530
----------------------------------------------------------------------
storm-core/src/ui/public/js/script.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b1ee165c/storm-core/src/ui/public/js/script.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/script.js b/storm-core/src/ui/public/js/script.js
index 8b59f65..b663418 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -221,7 +221,7 @@ function topologyActionJson(id, encodedId, name, status, msgTimeout, loggersTota
jsonData["deactivateStatus"] = (status === "ACTIVE") ? "enabled" : "disabled";
jsonData["rebalanceStatus"] = (status === "ACTIVE" || status === "INACTIVE" ) ? "enabled" : "disabled";
jsonData["killStatus"] = (status !== "KILLED") ? "enabled" : "disabled";
- jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=null && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
+ jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
jsonData["stopDebugStatus"] = (status === "ACTIVE" && debug) ? "enabled" : "disabled";
jsonData["loggersDisabled"] = loggersTotal==null || loggersTotal==0;
jsonData["currentSamplingPct"] = samplingPct;
@@ -233,7 +233,7 @@ function componentActionJson(encodedTopologyId, encodedId, componentName, status
jsonData["encodedTopologyId"] = encodedTopologyId;
jsonData["encodedId"] = encodedId;
jsonData["componentName"] = componentName;
- jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=null && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
+ jsonData["startDebugStatus"] = (status === "ACTIVE" && loggersTotal!=0 && !debug) ? "enabled" : "disabled";
jsonData["stopDebugStatus"] = (status === "ACTIVE" && debug) ? "enabled" : "disabled";
jsonData["loggersDisabled"] = loggersTotal==null || loggersTotal==0;
jsonData["currentSamplingPct"] = samplingPct;
[4/5] storm git commit: Merge branch 'STORM-2427' of
https://github.com/arunmahadevan/storm into 2427
Posted by sa...@apache.org.
Merge branch 'STORM-2427' of https://github.com/arunmahadevan/storm into 2427
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/34aea041
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/34aea041
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/34aea041
Branch: refs/heads/master
Commit: 34aea04150747df459fff02975bde2e39d93a2c5
Parents: c722940 b1ee165
Author: Satish Duggana <sa...@apache.org>
Authored: Wed Mar 22 10:06:17 2017 +0530
Committer: Satish Duggana <sa...@apache.org>
Committed: Wed Mar 22 10:06:17 2017 +0530
----------------------------------------------------------------------
storm-core/src/ui/public/component.html | 18 +++++++++++++++++-
storm-core/src/ui/public/js/script.js | 10 ++++++----
.../public/templates/component-page-template.html | 8 +++++++-
.../public/templates/topology-page-template.html | 8 +++++++-
storm-core/src/ui/public/topology.html | 2 +-
5 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------