storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [05/47] storm git commit: STORM-492 Fixed (bug) / Added time-ms from tracked-wait (trackedWait)
Date Wed, 12 Nov 2014 16:45:06 GMT
STORM-492 Fixed (bug) / Added time-ms from tracked-wait (trackedWait)


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

Branch: refs/heads/security
Commit: c6aabd4a8726766eb72d6a2b35b00c680b876ab3
Parents: a56ccc7
Author: Jungtaek Lim <kabhwan@gmail.com>
Authored: Fri Oct 3 02:57:30 2014 +0900
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Fri Oct 3 02:57:30 2014 +0900

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/testing.clj   | 2 +-
 storm-core/src/clj/backtype/storm/testing4j.clj | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/c6aabd4a/storm-core/src/clj/backtype/storm/testing.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/testing.clj b/storm-core/src/clj/backtype/storm/testing.clj
index 798dccc..9b4f4bb 100644
--- a/storm-core/src/clj/backtype/storm/testing.clj
+++ b/storm-core/src/clj/backtype/storm/testing.clj
@@ -594,7 +594,7 @@
                            (not= (global-amt track-id "transferred")                    
            
                                  (global-amt track-id "processed"))
                            ))]
-        (while-timeout TEST-TIMEOUT-MS (waiting?)
+        (while-timeout timeout-ms (waiting?)
                        ;; (println "Spout emitted: " (global-amt track-id "spout-emitted"))
                        ;; (println "Processed: " (global-amt track-id "processed"))
                        ;; (println "Transferred: " (global-amt track-id "transferred"))

http://git-wip-us.apache.org/repos/asf/storm/blob/c6aabd4a/storm-core/src/clj/backtype/storm/testing4j.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/testing4j.clj b/storm-core/src/clj/backtype/storm/testing4j.clj
index ff939a9..7790b6b 100644
--- a/storm-core/src/clj/backtype/storm/testing4j.clj
+++ b/storm-core/src/clj/backtype/storm/testing4j.clj
@@ -44,6 +44,7 @@
              ^:static [mkTrackedTopology [backtype.storm.ILocalCluster backtype.storm.generated.StormTopology]
backtype.storm.testing.TrackedTopology]
              ^:static [trackedWait [backtype.storm.testing.TrackedTopology] void]
              ^:static [trackedWait [backtype.storm.testing.TrackedTopology Integer] void]
+             ^:static [trackedWait [backtype.storm.testing.TrackedTopology Integer Integer]
void]
              ^:static [advanceClusterTime [backtype.storm.ILocalCluster Integer Integer]
void]
              ^:static [advanceClusterTime [backtype.storm.ILocalCluster Integer] void]
              ^:static [multiseteq [java.util.Collection java.util.Collection] boolean]
@@ -123,6 +124,8 @@
       (TrackedTopology.)))
 
 (defn -trackedWait
+  ([^TrackedTopology trackedTopology ^Integer amt ^Integer timeout-ms]
+    (tracked-wait trackedTopology amt timeout-ms))
   ([^TrackedTopology trackedTopology ^Integer amt]
    (tracked-wait trackedTopology amt))
   ([^TrackedTopology trackedTopology]


Mime
View raw message