You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/04/01 18:47:14 UTC
[1/5] storm git commit: STORM-1632) Disable event logging by default
Repository: storm
Updated Branches:
refs/heads/1.x-branch dc006daae -> 3d19c644f
STORM-1632) Disable event logging by default
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a33bc455
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a33bc455
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a33bc455
Branch: refs/heads/1.x-branch
Commit: a33bc455db2c4cce0d355c9c0fa4da60471b859b
Parents: f0abfff
Author: Roshan Naik <ro...@hortonworks.com>
Authored: Tue Mar 15 21:26:12 2016 -0700
Committer: Roshan Naik <ro...@hortonworks.com>
Committed: Tue Mar 15 21:26:12 2016 -0700
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a33bc455/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 7128cfe..3f6a1c9 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -222,7 +222,7 @@ topology.enable.message.timeouts: true
topology.debug: false
topology.workers: 1
topology.acker.executors: null
-topology.eventlogger.executors: null
+topology.eventlogger.executors: 0
topology.tasks: null
# maximum amount of time a message has to complete before it's considered failed
topology.message.timeout.secs: 30
[2/5] storm git commit: Enable/disable Debug button on UI if
eventloggers are enabled. Also show tooltip on Debug button
Posted by pt...@apache.org.
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/3354cc73
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3354cc73
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3354cc73
Branch: refs/heads/1.x-branch
Commit: 3354cc7369a494ef9645df08d0803dedfb3d9192
Parents: a33bc45
Author: Roshan Naik <ro...@hortonworks.com>
Authored: Wed Mar 30 16:30:43 2016 -0700
Committer: Roshan Naik <ro...@hortonworks.com>
Committed: Wed Mar 30 16:30:43 2016 -0700
----------------------------------------------------------------------
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/3354cc73/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 a880205..c25195d 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -210,7 +210,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;
@@ -220,7 +220,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/3354cc73/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 02b3c76..a72effc 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -434,7 +434,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/3354cc73/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 feb81f8..061fd91 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -285,7 +285,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);
[3/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 pt...@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/7d7b3c20
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7d7b3c20
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7d7b3c20
Branch: refs/heads/1.x-branch
Commit: 7d7b3c2086a0172757af4bfc2a1a9dd9feee696c
Parents: 3354cc7
Author: Roshan Naik <ro...@hortonworks.com>
Authored: Thu Mar 31 18:16:52 2016 -0700
Committer: Roshan Naik <ro...@hortonworks.com>
Committed: Thu Mar 31 18:16:52 2016 -0700
----------------------------------------------------------------------
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/7d7b3c20/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 6d5465f..37ee525 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -192,10 +192,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/7d7b3c20/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 c25195d..ff3c525 100644
--- a/storm-core/src/ui/public/js/script.js
+++ b/storm-core/src/ui/public/js/script.js
@@ -222,17 +222,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/7d7b3c20/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 3626291..472a769 100644
--- a/storm-core/src/ui/public/templates/component-page-template.html
+++ b/storm-core/src/ui/public/templates/component-page-template.html
@@ -557,7 +557,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/7d7b3c20/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 a72effc..917831a 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -434,7 +434,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>
[4/5] storm git commit: Merge branch 'STORM-1632' of
github.com:roshannaik/storm into 1.x-branch
Posted by pt...@apache.org.
Merge branch 'STORM-1632' of github.com:roshannaik/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b15e6ab7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b15e6ab7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b15e6ab7
Branch: refs/heads/1.x-branch
Commit: b15e6ab79a671590b878530b9734233d3a77f59b
Parents: dc006da 7d7b3c2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 1 12:35:54 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 1 12:35:54 2016 -0400
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
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 +-
6 files changed, 39 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[5/5] storm git commit: add STORM-1632 to changelog
Posted by pt...@apache.org.
add STORM-1632 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3d19c644
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3d19c644
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3d19c644
Branch: refs/heads/1.x-branch
Commit: 3d19c644fd0f6310743279aa8b57da5e2500fa48
Parents: b15e6ab
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 1 12:36:55 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 1 12:36:55 2016 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3d19c644/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a1d748..000a8f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1632 Disable event logging by default
* STORM-1667: Log the IO exception when deleting worker pid dir
* STORM-1669: Fix SolrUpdateBolt flush bug
* STORM-1668: Flux silently fails while setting a non-existent property.