From df90de3a5fa5b0af73283dec21bd564d0bca9204 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 18 Aug 2020 15:55:25 -0400
Subject: [PATCH] Change default Lettuce command timeout to 10s.

---
 .../configuration/RedisClusterConfiguration.java              | 2 +-
 .../textsecuregcm/redis/FaultTolerantRedisCluster.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisClusterConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisClusterConfiguration.java
index 11b7b5d10..4a2f60e3c 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisClusterConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RedisClusterConfiguration.java
@@ -16,7 +16,7 @@ public class RedisClusterConfiguration {
 
     @JsonProperty
     @NotNull
-    private Duration timeout = Duration.ofSeconds(2);
+    private Duration timeout = Duration.ofSeconds(10);
 
     @JsonProperty
     @NotNull
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
index f577bf09e..dd21e44a9 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
@@ -56,11 +56,11 @@ public class FaultTolerantRedisCluster {
     }
 
     @VisibleForTesting
-    FaultTolerantRedisCluster(final String name, final RedisClusterClient clusterClient, final Duration timeout, final CircuitBreakerConfiguration circuitBreakerConfiguration) {
+    FaultTolerantRedisCluster(final String name, final RedisClusterClient clusterClient, final Duration commandTimeout, final CircuitBreakerConfiguration circuitBreakerConfiguration) {
         this.name = name;
 
         this.clusterClient = clusterClient;
-        this.clusterClient.setDefaultTimeout(timeout);
+        this.clusterClient.setDefaultTimeout(commandTimeout);
 
         this.stringConnection = clusterClient.connect();
         this.binaryConnection = clusterClient.connect(ByteArrayCodec.INSTANCE);