storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [41/47] storm git commit: Revert "Merge branch 'STORM-492' of https://github.com/HeartSaVioR/storm into STORM-492"
Date Wed, 12 Nov 2014 16:45:42 GMT
Revert "Merge branch 'STORM-492' of https://github.com/HeartSaVioR/storm into STORM-492"

This reverts commit 1b8a32e2c3e8e624fc1ca1863898c3a10834151e, reversing
changes made to a1e1c1e206bcc22d0721226531fb1328c2d8cd53.


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

Branch: refs/heads/security
Commit: f880d619972bbbb0a1c3519298efbce260112ea6
Parents: 7602f43
Author: Jungtaek Lim <kabhwan@gmail.com>
Authored: Thu Nov 6 07:07:22 2014 +0900
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Thu Nov 6 07:07:22 2014 +0900

----------------------------------------------------------------------
 DEVELOPER.md                                    | 3 ---
 storm-core/src/clj/backtype/storm/testing.clj   | 6 ++----
 storm-core/src/clj/backtype/storm/testing4j.clj | 3 ---
 3 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f880d619/DEVELOPER.md
----------------------------------------------------------------------
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 4af1e3c..81a4122 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -229,9 +229,6 @@ The following commands must be run from the top-level directory.
     # Build the code and run the tests (requires nodejs, python and ruby installed) 
     $ mvn clean install
 
-    # Build the code and run the tests, with specifying default test timeout (in millisecond)
-    $ mvn clean install -DSTORM_TEST_TIMEOUT_MS=10000
-
     # Build the code but skip the tests
     $ mvn clean install -DskipTests=true
 

http://git-wip-us.apache.org/repos/asf/storm/blob/f880d619/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 79d3277..798dccc 100644
--- a/storm-core/src/clj/backtype/storm/testing.clj
+++ b/storm-core/src/clj/backtype/storm/testing.clj
@@ -187,9 +187,7 @@
       ;; on windows, the host process still holds lock on the logfile
       (catch Exception e (log-message (.getMessage e)))) ))
 
-(def TEST-TIMEOUT-MS
-  (let [timeout (System/getProperty "STORM_TEST_TIMEOUT_MS")]
-    (parse-int (if timeout timeout "5000"))))
+(def TEST-TIMEOUT-MS 5000)
 
 (defmacro while-timeout [timeout-ms condition & body]
   `(let [end-time# (+ (System/currentTimeMillis) ~timeout-ms)]
@@ -596,7 +594,7 @@
                            (not= (global-amt track-id "transferred")                    
            
                                  (global-amt track-id "processed"))
                            ))]
-        (while-timeout timeout-ms (waiting?)
+        (while-timeout TEST-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/f880d619/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 7790b6b..ff939a9 100644
--- a/storm-core/src/clj/backtype/storm/testing4j.clj
+++ b/storm-core/src/clj/backtype/storm/testing4j.clj
@@ -44,7 +44,6 @@
              ^: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]
@@ -124,8 +123,6 @@
       (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