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 2014/07/01 22:40:53 UTC

[22/24] git commit: resolve the metrics_test hang problem with d2r's patch

resolve the metrics_test hang problem with d2r's patch


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

Branch: refs/heads/master
Commit: 573c42a64885dac9a6a0d4c69a754500b607a8f1
Parents: b004e06
Author: JuDasheng <ju...@meituan.com>
Authored: Tue Jul 1 22:30:06 2014 +0800
Committer: JuDasheng <ju...@meituan.com>
Committed: Tue Jul 1 22:30:06 2014 +0800

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/testing.clj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/573c42a6/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 32f7f88..1a5f53e 100644
--- a/storm-core/src/clj/backtype/storm/testing.clj
+++ b/storm-core/src/clj/backtype/storm/testing.clj
@@ -230,7 +230,10 @@
          (log-error t# "Error in cluster")
          (throw t#))
        (finally
-         (kill-local-storm-cluster ~cluster-sym)))))
+         (let [keep-waiting?# (atom true)]
+           (future (while @keep-waiting?# (simulate-wait ~cluster-sym)))
+           (kill-local-storm-cluster ~cluster-sym)
+           (reset! keep-waiting?# false))))))
 
 (defmacro with-simulated-time-local-cluster
   [& args]