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 2015/08/20 14:32:27 UTC
[1/4] storm git commit: [STORM-949] On the topology summary UI page,
added Elapsed time since error column.
Repository: storm
Updated Branches:
refs/heads/master 9c9418843 -> cc276087b
[STORM-949] On the topology summary UI page, added Elapsed time since error column.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bfd34a5f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bfd34a5f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bfd34a5f
Branch: refs/heads/master
Commit: bfd34a5f46ee36e9237c0d7ea7ae4bed9dc567ee
Parents: c3a9385
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Tue Aug 11 15:16:02 2015 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Wed Aug 12 10:40:49 2015 -0500
----------------------------------------------------------------------
.../templates/topology-page-template.html | 16 +++++++++++++++-
storm-core/src/ui/public/topology.html | 20 +++++++++++++++++++-
2 files changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bfd34a5f/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 ddf89b7..54b6805 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -226,6 +226,10 @@
</th>
<th class="header">Last error
</th>
+ <th class="header">
+ <span data-toggle="tooltip" data-placement="left" title="Format: Hours:Minutes:Seconds">
+ Time Elapsed Since Error
+ </th>
</tr>
</thead>
<tbody>
@@ -244,6 +248,9 @@
<td>
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
+ <td>
+ <span id="{{errorLapsedSecs}}" class="elapsedErrorTime">{{errorLapsedSecs}}</span>
+ </td>
{{/spouts}}
</tbody>
</table>
@@ -313,6 +320,10 @@
</th>
<th class="header">Last error
</th>
+ <th class="header">
+ <span data-toggle="tooltip" data-placement="left" title="Format: Hours:Minutes:Seconds">
+ Time Elapsed Since Error
+ </th>
</tr></thead>
<tbody>
{{#bolts}}
@@ -333,6 +344,9 @@
<td>
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
+ <td>
+ <span id="{{errorLapsedSecs}}" class="elapsedErrorTime">{{errorLapsedSecs}}</span>
+ </td>
{{/bolts}}
</tbody>
</script>
@@ -345,4 +359,4 @@
<input {{rebalanceStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'rebalance', true, {{msgTimeout}})" type="button" value="Rebalance" class="btn btn-default">
<input {{killStatus}} onclick="confirmAction('{{encodedId}}', '{{name}}', 'kill', true, 30)" type="button" value="Kill" class="btn btn-default">
</p>
-</script>
+</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/bfd34a5f/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 0a1a05b..c5b30d5 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -181,6 +181,24 @@ $(document).ready(function() {
errorCells[i].style.borderBottomColor = "#9d261d";
}
}
+ var errorElapsedTime = document.getElementsByClassName("elapsedErrorTime");
+ for (i =0; i < errorElapsedTime.length; i++)
+ {
+ if((errorElapsedTime[i].id))
+ {
+ var sec_num = parseInt(errorElapsedTime[i].id, 10);
+ var hours = Math.floor(sec_num / 3600);
+ var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
+ var seconds = sec_num - (hours * 3600) - (minutes * 60);
+
+ if (hours < 10) {hours = "0"+hours;}
+ if (minutes < 10) {minutes = "0"+minutes;}
+ if (seconds < 10) {seconds = "0"+seconds;}
+ var time = hours+':'+minutes+':'+seconds;
+
+ errorElapsedTime[i].innerHTML = time;
+ }
+ }
$('#topology-summary [data-toggle="tooltip"]').tooltip();
$('#topology-stats [data-toggle="tooltip"]').tooltip();
$('#spout-stats [data-toggle="tooltip"]').tooltip();
@@ -192,4 +210,4 @@ $(document).ready(function() {
});
});
</script>
-</html>
+</html>
\ No newline at end of file
[3/4] storm git commit: Merge branch 'STORM-949' of
https://github.com/jerrypeng/storm into STORM-949
Posted by ka...@apache.org.
Merge branch 'STORM-949' of https://github.com/jerrypeng/storm into STORM-949
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d3b9a337
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d3b9a337
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d3b9a337
Branch: refs/heads/master
Commit: d3b9a337758329520ccef6cd73e096a4f1d59842
Parents: 9c94188 ef14347
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 20 21:29:32 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 20 21:29:32 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 6 ++--
.../templates/topology-page-template.html | 12 ++++++-
storm-core/src/ui/public/topology.html | 35 +++++++++++++++++++-
3 files changed, 49 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: Changed to show time/date for last error and
hover over tooltip will show elapsed time since error
Posted by ka...@apache.org.
Changed to show time/date for last error and hover over tooltip will show elapsed time since error
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ef14347f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ef14347f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ef14347f
Branch: refs/heads/master
Commit: ef14347f437a6c98f019fc49e8e1a095af0c14b4
Parents: bfd34a5
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Wed Aug 19 23:37:05 2015 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Thu Aug 20 00:21:14 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 6 ++-
.../templates/topology-page-template.html | 12 ++---
storm-core/src/ui/public/topology.html | 47 +++++++++++++-------
3 files changed, 39 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ef14347f/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 b0e266c..ea3c946 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -647,7 +647,8 @@
"errorPort" error-port
"errorWorkerLogLink" (worker-log-link error-host error-port top-id secure?)
"errorLapsedSecs" (get-error-time last-error)
- "lastError" (get-error-data last-error)}))
+ "lastError" (get-error-data last-error)
+ "time" (if last-error (* 1000 (long (.get_error_time_secs ^ErrorInfo last-error))))}))
(defn bolt-comp [top-id summ-map errors window include-sys? secure?]
(for [[id summs] summ-map
@@ -674,7 +675,8 @@
"errorPort" error-port
"errorWorkerLogLink" (worker-log-link error-host error-port top-id secure?)
"errorLapsedSecs" (get-error-time last-error)
- "lastError" (get-error-data last-error)}))
+ "lastError" (get-error-data last-error)
+ "time" (if last-error (* 1000 (long (.get_error_time_secs ^ErrorInfo last-error))))}))
(defn topology-summary [^TopologyInfo summ]
(let [executors (.get_executors summ)
http://git-wip-us.apache.org/repos/asf/storm/blob/ef14347f/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 54b6805..44db004 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -226,9 +226,7 @@
</th>
<th class="header">Last error
</th>
- <th class="header">
- <span data-toggle="tooltip" data-placement="left" title="Format: Hours:Minutes:Seconds">
- Time Elapsed Since Error
+ <th class="header">Error Time
</th>
</tr>
</thead>
@@ -249,7 +247,7 @@
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
<td>
- <span id="{{errorLapsedSecs}}" class="elapsedErrorTime">{{errorLapsedSecs}}</span>
+ <span id="{{time}}" class="errorTime" data-toggle="tooltip" title="{{errorLapsedSecs}}">{{time}}</span>
</td>
{{/spouts}}
</tbody>
@@ -320,9 +318,7 @@
</th>
<th class="header">Last error
</th>
- <th class="header">
- <span data-toggle="tooltip" data-placement="left" title="Format: Hours:Minutes:Seconds">
- Time Elapsed Since Error
+ <th class="header">Error Time
</th>
</tr></thead>
<tbody>
@@ -345,7 +341,7 @@
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
<td>
- <span id="{{errorLapsedSecs}}" class="elapsedErrorTime">{{errorLapsedSecs}}</span>
+ <span id="{{time}}" class="errorTime" data-toggle="tooltip" title="{{errorLapsedSecs}}">{{time}}</span>
</td>
{{/bolts}}
</tbody>
http://git-wip-us.apache.org/repos/asf/storm/blob/ef14347f/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 c5b30d5..c1c7b50 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -181,23 +181,38 @@ $(document).ready(function() {
errorCells[i].style.borderBottomColor = "#9d261d";
}
}
- var errorElapsedTime = document.getElementsByClassName("elapsedErrorTime");
- for (i =0; i < errorElapsedTime.length; i++)
+
+ var errorTime = document.getElementsByClassName("errorTime");
+ for (i=0; i < errorTime.length; i++)
{
- if((errorElapsedTime[i].id))
- {
- var sec_num = parseInt(errorElapsedTime[i].id, 10);
- var hours = Math.floor(sec_num / 3600);
- var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
- var seconds = sec_num - (hours * 3600) - (minutes * 60);
-
- if (hours < 10) {hours = "0"+hours;}
- if (minutes < 10) {minutes = "0"+minutes;}
- if (seconds < 10) {seconds = "0"+seconds;}
- var time = hours+':'+minutes+':'+seconds;
-
- errorElapsedTime[i].innerHTML = time;
- }
+ if((errorTime[i].id))
+ {
+ var a = new Date(parseInt(errorTime[i].id));
+ var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+ var days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thur', 'Fri', 'Sat'];
+ var year = a.getFullYear();
+ var month = months[a.getMonth()];
+ var date = a.getDate();
+ var hour = a.getHours();
+ var min = a.getMinutes();
+ var sec = a.getSeconds();
+ var day = days[a.getDay()];
+ if (hour < 10) {hour = "0"+hour;}
+ if (min < 10) {min = "0"+min;}
+ if (sec < 10) {sec = "0"+sec;}
+ var time = day + ', '+date + ' ' + month + ' ' + year + ' ' + hour + ':' + min + ':' + sec;
+
+ errorTime[i].innerHTML = time;
+ var sec_num = parseInt(errorTime[i].title, 10);
+ var hours = Math.floor(sec_num / 3600);
+ var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
+ var seconds = sec_num - (hours * 3600) - (minutes * 60);
+ if (hours < 10) {hours = "0"+hours;}
+ if (minutes < 10) {minutes = "0"+minutes;}
+ if (seconds < 10) {seconds = "0"+seconds;}
+ var time = hours+':'+minutes+':'+seconds;
+ errorTime[i].title = "Elapsed Time Since Error: " + time;
+ }
}
$('#topology-summary [data-toggle="tooltip"]').tooltip();
$('#topology-stats [data-toggle="tooltip"]').tooltip();
[4/4] storm git commit: add STORM-949 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-949 to CHANGELOG.md
* also add jerrypeng to contributor list
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cc276087
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cc276087
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cc276087
Branch: refs/heads/master
Commit: cc276087bb542b92c849f099b5b636e3afddd915
Parents: d3b9a33
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 20 21:31:29 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 20 21:31:29 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/cc276087/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 583d2de..90cfde1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
* STORM-988: supervisor.slots.ports should not allow duplicate element values
* STORM-975: Storm-Kafka trident topology example
* STORM-958: Add config for init params of group mapping service
+ * STORM-949: On the topology summary UI page, last shown error should have the time and date
## 0.10.0-beta2
* STORM-843: [storm-redis] Add Javadoc to storm-redis
http://git-wip-us.apache.org/repos/asf/storm/blob/cc276087/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 84fb9f7..c90a4ed 100644
--- a/README.markdown
+++ b/README.markdown
@@ -215,6 +215,7 @@ under the License.
* Gabor Liptak ([@gliptak](https://github.com/glibtak))
* Arun Mahadevan ([@arunmahadevan](https://github.com/arunmahadevan))
* Yvonne Ironberg ([@YvonneIronberg](https://github.com/YvonneIronberg))
+* Boyang Jerry Peng ([@jerrypeng](https://github.com/jerrypeng))
## Acknowledgements