You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/02/02 14:43:47 UTC
[1/3] storm git commit: STORM-2335 Fix broken Topology visualization
with empty ':transferred' in executor stats
Repository: storm
Updated Branches:
refs/heads/master 81aea91f1 -> a49483da0
STORM-2335 Fix broken Topology visualization with empty ':transferred' in executor stats
* also fix another bug: stream table and graph box was created for each 'Show Visualization' click
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4ddd1880
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4ddd1880
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4ddd1880
Branch: refs/heads/master
Commit: 4ddd1880dacc9a9c5ab9d760517f6552d993eac8
Parents: 4c5e34e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Feb 1 17:17:46 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Feb 1 17:17:46 2017 +0900
----------------------------------------------------------------------
storm-core/src/ui/public/js/visualization.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4ddd1880/storm-core/src/ui/public/js/visualization.js
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/js/visualization.js b/storm-core/src/ui/public/js/visualization.js
index 4daadc2..e82801f 100644
--- a/storm-core/src/ui/public/js/visualization.js
+++ b/storm-core/src/ui/public/js/visualization.js
@@ -309,7 +309,7 @@ function gather_stream_count(stats, stream, time) {
var transferred = 0;
if(stats)
for(var i = 0; i < stats.length; i++) {
- if(stats[i][":transferred"] != null)
+ if(stats[i][":transferred"] != null && stats[i][":transferred"][time] != undefined)
{
var stream_trans = stats[i][":transferred"][time][stream];
if(stream_trans != null)
@@ -391,12 +391,14 @@ function show_visualization(sys) {
getStatic("/templates/topology-page-template.html", function(template) {
jsError(function() {
var topologyVisualization = $("#visualization-container");
- topologyVisualization.append(
- Mustache.render($(template)
- .filter("#topology-visualization-container-template")
- .html(),
- response));
- });
+ if (topologyVisualization.find("canvas").length == 0) {
+ topologyVisualization.append(
+ Mustache.render($(template)
+ .filter("#topology-visualization-container-template")
+ .html(),
+ response));
+ }
+ });
if(sys == null)
{
[3/3] storm git commit: STORM-2335: CHANGELOG
Posted by ka...@apache.org.
STORM-2335: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a49483da
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a49483da
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a49483da
Branch: refs/heads/master
Commit: a49483da0accf7e8eee09d52169fb35452ec5aa8
Parents: 9d44809
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 2 23:43:27 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 2 23:43:27 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a49483da/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6174edf..3e606dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -196,6 +196,7 @@
* STORM-1769: Added a test to check local nimbus with notifier plugin
## 1.1.0
+ * STORM-2335: Fix broken Topology visualization with empty ':transferred' in executor stats
* STORM-2331: Emitting from JavaScript should work when not anchoring.
* STORM-2320: DRPC client printer class reusable for local and remote DRPC.
* STORM-2225: change spout config to be simpler.
[2/3] storm git commit: Merge branch 'STORM-2335' of
https://github.com/HeartSaVioR/storm into STORM-2335-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2335' of https://github.com/HeartSaVioR/storm into STORM-2335-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9d448094
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9d448094
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9d448094
Branch: refs/heads/master
Commit: 9d4480940846ac876ffcfaf8204c659f9dd16954
Parents: 81aea91 4ddd188
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 2 23:41:40 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 2 23:41:40 2017 +0900
----------------------------------------------------------------------
storm-core/src/ui/public/js/visualization.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------