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 2017/04/12 15:04:29 UTC

[1/4] storm git commit: STORM-2463: fix DRPCTest.testDequeueAfterTimeout

Repository: storm
Updated Branches:
  refs/heads/master 78b074caa -> d8368b0e5


STORM-2463: fix DRPCTest.testDequeueAfterTimeout

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

Branch: refs/heads/master
Commit: b44f473bf72b0fb2178def0532a75cc1d1f60b4d
Parents: 1850dd5
Author: Xin Wang <be...@163.com>
Authored: Tue Apr 11 21:31:29 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Tue Apr 11 21:31:29 2017 +0800

----------------------------------------------------------------------
 .../src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b44f473b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
index 1297e42..cca88a0 100644
--- a/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
+++ b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit;
 import javax.security.auth.Subject;
 
 import org.apache.storm.Config;
-import org.apache.storm.daemon.drpc.DRPC;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.DRPCExceptionType;
 import org.apache.storm.generated.DRPCExecutionException;
@@ -118,7 +117,7 @@ public class DRPCTest {
     
     @Test
     public void testDequeueAfterTimeout() throws Exception {
-        long timeout = 2;
+        long timeout = 2000;
         try (DRPC server = new DRPC(null, timeout)) {
             long start = Time.currentTimeMillis();
             try {


[4/4] storm git commit: Added STORM-2463 to Changelog

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


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

Branch: refs/heads/master
Commit: d8368b0e5dc23b0ad0b5972bac31b50334341bbb
Parents: 6898fb2
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 12 09:38:43 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Apr 12 09:38:43 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/storm/blob/d8368b0e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17c2df0..10655bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 \ufeff## 2.0.0
+ * STORM-2463: fix DRPCTest.testDequeueAfterTimeout test failure 
  * STORM-2447: add in storm local to avoid having server on worker classpath
  * STORM-2458: Kafka Spout should allow hooking up custom logic when retries have exhanusted
  * STORM-2461: modify storm-hdfs's READEME.md and update storm-hdfs.md


[3/4] storm git commit: Merge branch 'STORM-2463' of https://github.com/vesense/storm into STORM-2463

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

STORM-2463: fix DRPCTest.testDequeueAfterTimeout test failure


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

Branch: refs/heads/master
Commit: 6898fb2eb344a69c1d8e4c9609e52d4d658600e3
Parents: 78b074c 0aa6040
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 12 09:38:19 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Apr 12 09:38:19 2017 -0500

----------------------------------------------------------------------
 .../src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------



[2/4] storm git commit: STORM-2463: reduce the timeout value to 1s

Posted by bo...@apache.org.
STORM-2463: reduce the timeout value to 1s

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

Branch: refs/heads/master
Commit: 0aa6040fbdc2fa781c8fbbd1bedae9b499b3d4de
Parents: b44f473
Author: Xin Wang <be...@163.com>
Authored: Wed Apr 12 09:47:19 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Apr 12 09:47:19 2017 +0800

----------------------------------------------------------------------
 .../src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0aa6040f/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
----------------------------------------------------------------------
diff --git a/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
index cca88a0..73f5ff4 100644
--- a/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
+++ b/storm-server/src/test/java/org/apache/storm/daemon/drpc/DRPCTest.java
@@ -117,7 +117,7 @@ public class DRPCTest {
     
     @Test
     public void testDequeueAfterTimeout() throws Exception {
-        long timeout = 2000;
+        long timeout = 1000;
         try (DRPC server = new DRPC(null, timeout)) {
             long start = Time.currentTimeMillis();
             try {