[geode] branch develop updated: GEODE-8577: Increase time to get Redis native connection (#5874)

[je...@apache.org]

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

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new cad1eb5  GEODE-8577: Increase time to get Redis native connection (#5874)
cad1eb5 is described below

commit cad1eb55f6de613a62efc2a3daf2935b2b7aebda
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Mon Jan 11 07:40:01 2021 -0800

    GEODE-8577: Increase time to get Redis native connection (#5874)
    
    - It's possible that the test is exhausting the number of available
      sockets. Closed connections sit in TIME_WAIT for 60 seconds on Linux.
      This change increases the time to get a connection beyond that to
      allow for connections to be fully closed and ports to be released.
---
 .../internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java     | 2 --
 .../redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java
index 772ebb1..ce7778f 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/pubsub/PubSubNativeRedisAcceptanceTest.java
@@ -16,11 +16,9 @@
 package org.apache.geode.redis.internal.executor.pubsub;
 
 import org.junit.ClassRule;
-import org.junit.Ignore;
 
 import org.apache.geode.NativeRedisTestRule;
 
-@Ignore("GEODE-8577")
 public class PubSubNativeRedisAcceptanceTest extends AbstractPubSubIntegrationTest {
   @ClassRule
   public static NativeRedisTestRule redis = new NativeRedisTestRule();
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java
index 9e3f323..832441a 100644
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java
@@ -715,7 +715,7 @@ public abstract class AbstractPubSubIntegrationTest implements RedisPortSupplier
   private Jedis getConnection() {
     Exception lastException = null;
 
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 20; i++) {
       Jedis client = null;
       try {
         client = new Jedis("localhost", getPort(), JEDIS_TIMEOUT);
@@ -731,7 +731,7 @@ public abstract class AbstractPubSubIntegrationTest implements RedisPortSupplier
         }
       }
       try {
-        Thread.sleep(1000);
+        Thread.sleep(5000);
       } catch (InterruptedException e) {
         e.printStackTrace();
       }