[ratis] branch master updated: RATIS-1491. TestNettyDataStreamChainTopologyWithGrpcCluster timed out after 100 seconds (#583)

[szetszwo]

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new e296b56  RATIS-1491. TestNettyDataStreamChainTopologyWithGrpcCluster 
timed out after 100 seconds (#583)
e296b56 is described below

commit e296b5632e523a8626310eb999cb33aeb22ddaa9
Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com>
AuthorDate: Tue Jan 18 17:44:08 2022 +0100

    RATIS-1491. TestNettyDataStreamChainTopologyWithGrpcCluster timed out after 
100 seconds (#583)
---
 .../src/test/java/org/apache/ratis/OutputStreamBaseTest.java     | 2 +-
 .../org/apache/ratis/datastream/DataStreamAsyncClusterTests.java | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java 
b/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
index 1a5b509..aa69fa4 100644
--- a/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
@@ -70,7 +70,7 @@ public abstract class OutputStreamBaseTest<CLUSTER extends 
MiniRaftCluster>
     return b;
   }
 
-  @Test(timeout = 300000)
+  @Test
   public void testSimpleWrite() throws Exception {
     runWithNewCluster(NUM_SERVERS, this::runTestSimpleWrite);
   }
diff --git 
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
 
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
index 7ddde30..b453e7b 100644
--- 
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
+++ 
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
@@ -48,12 +48,17 @@ public abstract class DataStreamAsyncClusterTests<CLUSTER 
extends MiniRaftCluste
     extends DataStreamClusterTests<CLUSTER> {
   final Executor executor = Executors.newFixedThreadPool(16);
 
+  @Override
+  public int getGlobalTimeoutSeconds() {
+    return 300;
+  }
+
   @Test
   public void testMultipleStreamsSingleServer() throws Exception {
     runWithNewCluster(1, this::runTestDataStream);
   }
 
-  @Test(timeout = 300000)
+  @Test
   public void testMultipleStreamsMultipleServers() throws Exception {
     // Avoid changing leader
     final TimeDuration min = 
RaftServerConfigKeys.Rpc.timeoutMin(getProperties());
@@ -68,7 +73,7 @@ public abstract class DataStreamAsyncClusterTests<CLUSTER 
extends MiniRaftCluste
     RaftServerConfigKeys.Rpc.setTimeoutMax(getProperties(), max);
   }
 
-  @Test(timeout = 300000)
+  @Test
   public void testMultipleStreamsMultipleServersStepDownLeader() throws 
Exception {
     runWithNewCluster(3, this::runTestDataStreamStepDownLeader);
   }