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 2014/06/23 17:19:26 UTC
[15/22] git commit: Fixing testing issues.
Fixing testing issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7341f70d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7341f70d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7341f70d
Branch: refs/heads/security
Commit: 7341f70d19a70494ea618c4a613cf12772c25642
Parents: 1ec738e
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Jun 20 21:54:04 2014 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Jun 20 21:54:04 2014 +0000
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 4 ++--
storm-core/src/ui/public/component.html | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7341f70d/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 4727d3c..10b62e7 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -858,8 +858,8 @@
(defn- get-errors [storm-cluster-state storm-id component-id]
(->> (.errors storm-cluster-state storm-id component-id)
(map #(doto (ErrorInfo. (:error %) (:time-secs %))
- (.set_host error-info (:host %))
- (.set_port error-info (:port %))))))
+ (.set_host (:host %))
+ (.set_port (:port %))))))
(defn- thriftify-executor-id [[first-task-id last-task-id]]
(ExecutorInfo. (int first-task-id) (int last-task-id)))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7341f70d/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 aae0245..823f8a3 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -70,6 +70,10 @@ $(document).ready(function() {
var executorStats = $("#component-executor-stats");
var componentErrors = $("#component-errors");
$.get("/templates/component-page-template.html", function(template) {
+ componentErrors.append(Mustache.render($(template).filter("#component-errors-template").html(),response));
+ if(response["componentErrors"].length > 0) {
+ $("#component-errors-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
+ }
componentSummary.append(Mustache.render($(template).filter("#component-summary-template").html(),response));
if(response["componentType"] == "spout") {
componentStatsDetail.append(Mustache.render($(template).filter("#spout-stats-detail-template").html(),response));
@@ -92,10 +96,6 @@ $(document).ready(function() {
$("#bolt-executor-table").tablesorter({ sortList: [[0,0]], headers: {}});
}
}
- componentErrors.append(Mustache.render($(template).filter("#component-errors-template").html(),response));
- if(response["componentErrors"].length > 0) {
- $("#component-errors-table").tablesorter({ sortList: [[0,0]], headers: {1: { sorter: "stormtimestr"}}});
- }
});
});
});