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 2016/02/26 03:28:33 UTC
[1/4] storm git commit: fix broken component error times
Repository: storm
Updated Branches:
refs/heads/1.x-branch a24b89678 -> 7fc342cbc
fix broken component error times
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2c6fc600
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2c6fc600
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2c6fc600
Branch: refs/heads/1.x-branch
Commit: 2c6fc60054b1cb7115bf53d3d4f592888c263961
Parents: f6f05af
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri Feb 19 16:50:58 2016 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri Feb 19 16:50:58 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 13 ++++---------
storm-core/src/ui/public/component.html | 2 +-
storm-core/src/ui/public/topology.html | 2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2c6fc600/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj
index 9bd7a26..9e33984 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -157,11 +157,6 @@
(defn supervisor-log-link [host]
(url-format "http://%s:%s/daemonlog?file=supervisor.log" host (*STORM-CONF* LOGVIEWER-PORT)))
-(defn get-error-time
- [error]
- (if error
- (time-delta (.get_error_time_secs ^ErrorInfo error))))
-
(defn get-error-data
[error]
(if error
@@ -184,7 +179,7 @@
[error]
(if error
(.get_error_time_secs ^ErrorInfo error)
- ""))
+ 0))
(defn worker-dump-link [host port topology-id]
(url-format "http://%s:%s/dumps/%s/%s"
@@ -518,7 +513,7 @@
"errorTime" (get-error-time error-info)
"errorHost" host
"errorPort" port
- "errorLapsedSecs" (get-error-time error-info)
+ "errorLapsedSecs" (time-delta (get-error-time error-info))
"errorWorkerLogLink" (worker-log-link host port topo-id secure?)}))
(defn- common-agg-stats-json
@@ -644,14 +639,14 @@
reverse)]
{"componentErrors"
(for [^ErrorInfo e errors]
- {"errorTime" (* 1000 (long (.get_error_time_secs e)))
+ {"errorTime" (get-error-time e)
"errorHost" (.get_host e)
"errorPort" (.get_port e)
"errorWorkerLogLink" (worker-log-link (.get_host e)
(.get_port e)
topology-id
secure?)
- "errorLapsedSecs" (get-error-time e)
+ "errorLapsedSecs" (time-delta (get-error-time e))
"error" (.get_error e)})}))
(defmulti unpack-comp-agg-stat
http://git-wip-us.apache.org/repos/asf/storm/blob/2c6fc600/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 88187b6..6d5465f 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -301,7 +301,7 @@ $(document).ready(function() {
var errorTimeCells = document.getElementsByClassName("errorTimeSpan");
for (i = 0; i < errorTimeCells.length; i++)
{
- var timeInMilliseconds = errorTimeCells[i].id;
+ var timeInMilliseconds = errorTimeCells[i].id * 1000;
var time = parseInt(timeInMilliseconds);
var date = new Date(time);
errorTimeCells[i].innerHTML = date.toJSON();
http://git-wip-us.apache.org/repos/asf/storm/blob/2c6fc600/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 5869d9a..feb81f8 100644
--- a/storm-core/src/ui/public/topology.html
+++ b/storm-core/src/ui/public/topology.html
@@ -350,7 +350,7 @@ $(document).ready(function() {
{
if((errorTime[i].id))
{
- var a = new Date(parseInt(errorTime[i].id));
+ var a = new Date(parseInt(errorTime[i].id) * 1000);
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();
[2/4] storm git commit: Topo page last error time blank when no errors
Posted by ka...@apache.org.
Topo page last error time blank when no errors
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1397246d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1397246d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1397246d
Branch: refs/heads/1.x-branch
Commit: 1397246d2b2721783bb43445a84996ec552a05d5
Parents: 2c6fc60
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Wed Feb 24 16:12:19 2016 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Wed Feb 24 16:12:19 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 7 +++----
.../src/ui/public/templates/topology-page-template.html | 6 +++++-
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1397246d/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj
index 9e33984..c35e051 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -178,8 +178,7 @@
(defn get-error-time
[error]
(if error
- (.get_error_time_secs ^ErrorInfo error)
- 0))
+ (.get_error_time_secs ^ErrorInfo error)))
(defn worker-dump-link [host port topology-id]
(url-format "http://%s:%s/dumps/%s/%s"
@@ -513,7 +512,7 @@
"errorTime" (get-error-time error-info)
"errorHost" host
"errorPort" port
- "errorLapsedSecs" (time-delta (get-error-time error-info))
+ "errorLapsedSecs" (if-let [t (get-error-time error-info)] (time-delta t))
"errorWorkerLogLink" (worker-log-link host port topo-id secure?)}))
(defn- common-agg-stats-json
@@ -646,7 +645,7 @@
(.get_port e)
topology-id
secure?)
- "errorLapsedSecs" (time-delta (get-error-time e))
+ "errorLapsedSecs" (if-let [t (get-error-time e)] (time-delta t))
"error" (.get_error e)})}))
(defmulti unpack-comp-agg-stat
http://git-wip-us.apache.org/repos/asf/storm/blob/1397246d/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 1f81f1b..02b3c76 100644
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@ -323,7 +323,9 @@
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
<td>
+ {{#errorTime}}
<span id="{{errorTime}}" class="errorTime" data-toggle="tooltip" title="{{errorLapsedSecs}}">{{errorTime}}</span>
+ {{/errorTime}}
</td>
{{/spouts}}
</tbody>
@@ -417,7 +419,9 @@
<span id="{{errorLapsedSecs}}" class="errorSpan">{{lastError}}</span>
</td>
<td>
+ {{#errorTime}}
<span id="{{errorTime}}" class="errorTime" data-toggle="tooltip" title="{{errorLapsedSecs}}">{{errorTime}}</span>
+ {{/errorTime}}
</td>
{{/bolts}}
</tbody>
@@ -512,4 +516,4 @@
{{/loggers}}
</table>
</div>
-</script>
\ No newline at end of file
+</script>
[4/4] storm git commit: add STORM-1488 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1488 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/7fc342cb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7fc342cb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7fc342cb
Branch: refs/heads/1.x-branch
Commit: 7fc342cbc2bd8f757985038650d005c3de00c642
Parents: 9d782a1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 25 18:28:15 2016 -0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 25 18:28:15 2016 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7fc342cb/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa7bcd2..63b3c65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1488: UI Topology Page component last error timestamp is from 1970
* STORM-1542: Remove profile action retry in case of non-zero exit code
* STORM-1540: Fix Debug/Sampling for Trident
* STORM-1569: Allowing users to specify the nimbus thrift server queue size.
[3/4] storm git commit: Merge branch 'storm-1488-err-times-in-70s' of
https://github.com/d2r/storm into STORM-1488-1.x
Posted by ka...@apache.org.
Merge branch 'storm-1488-err-times-in-70s' of https://github.com/d2r/storm into STORM-1488-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9d782a1d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9d782a1d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9d782a1d
Branch: refs/heads/1.x-branch
Commit: 9d782a1d831a4d04a0e4c1ce4b962062780290da
Parents: a24b896 1397246
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 25 18:27:39 2016 -0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 25 18:27:39 2016 -0800
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 14 ++++----------
storm-core/src/ui/public/component.html | 2 +-
.../ui/public/templates/topology-page-template.html | 6 +++++-
storm-core/src/ui/public/topology.html | 2 +-
4 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------