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 2016/01/05 18:36:08 UTC

[1/3] storm git commit: STORM-1429: LocalizerTest fix

Repository: storm
Updated Branches:
  refs/heads/master a8554305b -> 4b672dedc


STORM-1429: LocalizerTest fix


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

Branch: refs/heads/master
Commit: 390e11e8bf27b37126c24597c46c1ec6b7dd7943
Parents: 57d7cf6
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Jan 4 18:08:55 2016 +0000
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Jan 4 18:08:55 2016 +0000

----------------------------------------------------------------------
 storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/390e11e8/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
index 2b84f23..339ac76 100644
--- a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
+++ b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
@@ -476,6 +476,10 @@ public class LocalizerTest {
 
     lrsrcSet = localizer.getUserResources().get(user1);
     assertEquals("local resource set size wrong", 2, lrsrcSet.getSize());
+    long end = System.currentTimeMillis() + 100;
+    while ((end - System.currentTimeMillis()) >= 0 && keyFile2.exists()) {
+      Thread.sleep(1);
+    }
     assertFalse("blob not deleted", keyFile2.exists());
     assertTrue("blob deleted", keyFile.exists());
     assertTrue("blob deleted", keyFile3.exists());


[3/3] storm git commit: Added STORM-1429 to Changelog

Posted by bo...@apache.org.
Added STORM-1429 to Changelog


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

Branch: refs/heads/master
Commit: 4b672dedc986741debf1d6b27cf6c48273efb023
Parents: 0340ffc
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 5 11:27:48 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 5 11:27:48 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/4b672ded/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9d34db..334e4a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1429: LocalizerTest fix
  * STORM-1401: removes multilang-test
  * STORM-1424: Removed unused topology-path variable
  * STORM-1427: add TupleUtils/listHashCode method and delete tuple.clj


[2/3] storm git commit: Merge branch 'STORM-1429' of https://github.com/revans2/incubator-storm into STORM-1429

Posted by bo...@apache.org.
Merge branch 'STORM-1429' of https://github.com/revans2/incubator-storm into STORM-1429

STORM-1429: LocalizerTest fix


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

Branch: refs/heads/master
Commit: 0340ffc85825432a025e8c6bd86e96bef7c0b6ca
Parents: a855430 390e11e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 5 11:27:27 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 5 11:27:27 2016 -0600

----------------------------------------------------------------------
 storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0340ffc8/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------