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/03/15 18:44:59 UTC
[26/30] storm git commit: resolve conflict
resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5bd5bd76
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5bd5bd76
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5bd5bd76
Branch: refs/heads/master
Commit: 5bd5bd7605d8bc74fb72d47bf44b3e5fadf3942e
Parents: 000fcb8
Author: 卫乐 <we...@taobao.com>
Authored: Tue Mar 8 20:57:13 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Tue Mar 8 20:57:13 2016 +0800
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5bd5bd76/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index f2e60bf..23ab435 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -2121,14 +2121,14 @@
^String component-id
^String window
^boolean include-sys?]
- (mark! nimbus:num-getComponentPageInfo-calls)
+ (.mark nimbus:num-getComponentPageInfo-calls)
(let [info (get-common-topo-info topo-id "getComponentPageInfo")
{:keys [executor->node+port node->host]} (:assignment info)
;TODO: when translating this function, you should replace the map-val with a proper for loop HERE
executor->host+port (map-val (fn [[node port]]
[(node->host node) port])
executor->node+port)
- comp-page-info (stats/agg-comp-execs-stats executor->host+port
+ comp-page-info (StatsUtil/aggCompExecsStats executor->host+port
(:task->component info)
(:beats info)
window