update tests to have timeouts disabled by default to avoid accidental timeouts and broken tests

Nathan Marz · Nathan Marz · commit 348d7f3a10e2 · 2012-05-28T22:58:38.000-07:00
diff --git a/src/clj/backtype/storm/daemon/executor.clj b/src/clj/backtype/storm/daemon/executor.clj
@@ -154,6 +154,7 @@
     (recursive-map
      :worker worker
      :worker-context worker-context
+     :executor-id executor-id
      :task-ids task-ids
      :component-id component-id
      :storm-conf storm-conf
@@ -202,15 +203,17 @@
         receive-queue (:receive-queue executor-data)
         context (:worker-context executor-data)]
     (when tick-time-secs
-      (schedule-recurring
-        (:timer worker)
-        tick-time-secs
-        tick-time-secs
-        (fn []
-          (disruptor/publish
-            receive-queue
-            [[nil (TupleImpl. context [tick-time-secs] -1 Constants/SYSTEM_TICK_STREAM_ID)]]
-            ))))))
+      (if-not (pos? tick-time-secs)
+        (log-message "Timeouts disabled for executor " (:executor-id executor-data))
+        (schedule-recurring
+          (:timer worker)
+          tick-time-secs
+          tick-time-secs
+          (fn []
+            (disruptor/publish
+              receive-queue
+              [[nil (TupleImpl. context [tick-time-secs] -1 Constants/SYSTEM_TICK_STREAM_ID)]]
+              )))))))
 
 (defn mk-executor [worker executor-id]
   (let [executor-data (executor-data worker executor-id)
diff --git a/src/clj/backtype/storm/testing.clj b/src/clj/backtype/storm/testing.clj
@@ -101,6 +101,7 @@
         daemon-conf (merge (read-storm-config)
                            {TOPOLOGY-SKIP-MISSING-KRYO-REGISTRATIONS true
                             ZMQ-LINGER-MILLIS 0
+                            TOPOLOGY-MESSAGE-TIMEOUT-SECS -1
                             }
                            daemon-conf
                            {STORM-CLUSTER-MODE "local"
@@ -313,7 +314,6 @@
     (Thread/sleep 100)
     ))
 
-
 (defprotocol CompletableSpout
   (exhausted? [this] "Whether all the tuples for this spout have been completed.")
   (cleanup [this] "Cleanup any global state kept")
