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 2015/08/24 15:52:28 UTC

[43/50] [abbrv] storm git commit: Fixing the uptime in nimbusSummary.

Fixing the uptime in nimbusSummary.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/95fb6809
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/95fb6809
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/95fb6809

Branch: refs/heads/master
Commit: 95fb6809fad6a5de8af67fec2f6af0556bd18ddb
Parents: 16293e4
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Wed Apr 1 18:19:58 2015 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Wed Aug 12 09:29:53 2015 -0700

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/daemon/nimbus.clj              | 1 +
 storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/95fb6809/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 5d9a038..9aa098a 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1353,6 +1353,7 @@
                       leader-host (.getHost leader)
                       leader-port (.getPort leader)]
                   (doseq [nimbus-summary nimbuses]
+                    (.set_uptime_secs nimbus-summary (time-delta (.get_uptime_secs nimbus-summary)))
                     (.set_isLeader nimbus-summary (and (= leader-host (.get_host nimbus-summary)) (= leader-port (.get_port nimbus-summary))))))
 
               topology-summaries (dofor [[id base] bases :when base]

http://git-wip-us.apache.org/repos/asf/storm/blob/95fb6809/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj b/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj
index 7188d7a..f7d3802 100644
--- a/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj
+++ b/storm-core/test/clj/backtype/storm/messaging/netty_unit_test.clj
@@ -20,7 +20,7 @@
   (:use [backtype.storm.daemon.worker :only [is-connection-ready]])
   (:import [java.util ArrayList]))
 
-(def port 6700)
+(def port (available-port))
 (def task 1)
 
 ;; In a "real" cluster (or an integration test), Storm itself would ensure that a topology's workers would only be