You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/20 18:15:27 UTC
[1/4] storm git commit: [STORM-1472] Fix the errorTime bug and show
the time to be readable
Repository: storm
Updated Branches:
refs/heads/master e7e9eb949 -> 56532a014
[STORM-1472] Fix the errorTime bug and show the time to be readable
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b48f02e3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b48f02e3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b48f02e3
Branch: refs/heads/master
Commit: b48f02e39dcbec62a29da6989c98e004b6b1c940
Parents: 6fcebe6
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Jan 13 20:52:59 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Jan 13 20:52:59 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 2 +-
storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java | 4 +++-
storm-core/src/ui/public/component.html | 9 +++++++++
.../src/ui/public/templates/component-page-template.html | 4 +++-
4 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b48f02e3/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 b309b2c..9bdc0e9 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -646,7 +646,7 @@
reverse)]
{"componentErrors"
(for [^ErrorInfo e errors]
- {"time" (* 1000 (long (.get_error_time_secs e)))
+ {"errorTime" (* 1000 (long (.get_error_time_secs e)))
"errorHost" (.get_host e)
"errorPort" (.get_port e)
"errorWorkerLogLink" (worker-log-link (.get_host e)
http://git-wip-us.apache.org/repos/asf/storm/blob/b48f02e3/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java b/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
index 3650df2..3495770 100644
--- a/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
+++ b/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
@@ -32,11 +32,13 @@ import org.apache.storm.utils.Utils;
public class Cluster {
/**
- * key: supervisor id, value: supervisor details
+ * key: supervisor id,
+ * value: supervisor's total and used resources, i.e. {totalMem, totalCpu, usedMem, usedCpu}
*/
private Map<String, SupervisorDetails> supervisors;
/**
* key: supervisor id, value: supervisor's total and used resources
+ * value: {requestedMemOnHeap, requestedMemOffHeap, requestedCpu, assignedMemOnHeap, assignedMemOffHeap, assignedCpu}
*/
private Map<String, Double[]> supervisorsResources;
http://git-wip-us.apache.org/repos/asf/storm/blob/b48f02e3/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 964eacb..06c485c 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -298,6 +298,15 @@ $(document).ready(function() {
//time, error
dtAutoPage("#component-errors-table", {});
+ var errorTimeCells = document.getElementsByClassName("errorTimeSpan");
+ for (i = 0; i < errorTimeCells.length; i++)
+ {
+ var timeInMilliseconds = errorTimeCells[i].id;
+ var time = parseInt(timeInMilliseconds);
+ var date = new Date(time);
+ errorTimeCells[i].innerHTML = date.toJSON();
+ }
+
var errorCells = document.getElementsByClassName("errorSpan");
for (i =0; i < errorCells.length; i++)
{
http://git-wip-us.apache.org/repos/asf/storm/blob/b48f02e3/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 e852eeb..79a21cd 100644
--- a/storm-core/src/ui/public/templates/component-page-template.html
+++ b/storm-core/src/ui/public/templates/component-page-template.html
@@ -539,7 +539,9 @@
<tbody>
{{#componentErrors}}
<tr>
- <td>{{errorTime}}</td>
+ <td>
+ <span id="{{errorTime}}" class="errorTimeSpan">{{errorTime}}</span>
+ </td>
<td>{{errorHost}}</td>
<td><a href="{{errorWorkerLogLink}}">{{errorPort}}</a></td>
<td>
[2/4] storm git commit: Minor
Posted by bo...@apache.org.
Minor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0d469c05
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0d469c05
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0d469c05
Branch: refs/heads/master
Commit: 0d469c057405726c607af07dd9a3daac986fea22
Parents: b48f02e
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Jan 20 10:21:02 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Jan 20 10:21:02 2016 -0600
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0d469c05/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java b/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
index 3495770..3650df2 100644
--- a/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
+++ b/storm-core/src/jvm/org/apache/storm/scheduler/Cluster.java
@@ -32,13 +32,11 @@ import org.apache.storm.utils.Utils;
public class Cluster {
/**
- * key: supervisor id,
- * value: supervisor's total and used resources, i.e. {totalMem, totalCpu, usedMem, usedCpu}
+ * key: supervisor id, value: supervisor details
*/
private Map<String, SupervisorDetails> supervisors;
/**
* key: supervisor id, value: supervisor's total and used resources
- * value: {requestedMemOnHeap, requestedMemOffHeap, requestedCpu, assignedMemOnHeap, assignedMemOffHeap, assignedCpu}
*/
private Map<String, Double[]> supervisorsResources;
[4/4] storm git commit: Added STORM-1472 to Changelog
Posted by bo...@apache.org.
Added STORM-1472 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/56532a01
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/56532a01
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/56532a01
Branch: refs/heads/master
Commit: 56532a014ab6530cc09ac031def87e68ddab6fed
Parents: 2d68387
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 20 10:59:01 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 20 10:59:01 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/56532a01/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91cdf0c..c5cdb3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
## 2.0.0
+
## 1.0.0
+ * STORM-1472: Fix the errorTime bug and show the time to be readable
* STORM-1450: Fix minor bugs and refactor code in ResourceAwareScheduler
* STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
* STORM-1482: add missing 'break' for RedisStoreBolt
[3/4] storm git commit: Merge branch '1472' of
https://github.com/zhuoliu/storm into STORM-1472
Posted by bo...@apache.org.
Merge branch '1472' of https://github.com/zhuoliu/storm into STORM-1472
STORM-1472: Fix the errorTime bug and show the time to be readable
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2d68387c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2d68387c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2d68387c
Branch: refs/heads/master
Commit: 2d68387c42634cc5badb770a7369fa7dd96f98d9
Parents: e7e9eb9 0d469c0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Jan 20 10:48:19 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Jan 20 10:48:19 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 2 +-
storm-core/src/ui/public/component.html | 9 +++++++++
.../src/ui/public/templates/component-page-template.html | 4 +++-
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------