From 31b1d8741fca5dda59b7f870e295d7dc92b68fe1 Mon Sep 17 00:00:00 2001
From: Hari Krishna Sunder <hari90@users.noreply.github.com>
Date: Thu, 12 Dec 2024 14:20:35 -0800
Subject: [PATCH] [#25278]: DocDB: Do not start redis proxy by default

Summary:
Redis is no longer supported. Starting the proxy causes unnecessary overhead.

Fixes #25278

Test Plan: Jenkins

Reviewers: slingam

Reviewed By: slingam

Subscribers: yql, svc_phabricator, ybase

Differential Revision: https://phorge.dev.yugabyte.com/D40614
---
 .../test/java/com/yugabyte/jedis/BaseJedisTest.java  | 12 ++++++++++++
 .../java/com/yugabyte/jedis/TestYBJedisCluster.java  |  1 +
 src/yb/tserver/tablet_server_main_impl.cc            |  2 +-
 src/yb/yql/redis/redisserver/redisserver-test.cc     |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/BaseJedisTest.java b/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/BaseJedisTest.java
index 323362a4b248..657fe6ca14e9 100644
--- a/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/BaseJedisTest.java
+++ b/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/BaseJedisTest.java
@@ -21,6 +21,7 @@
 import org.yb.client.YBClient;
 import org.yb.Common.PartitionSchemaPB.HashSchema;
 import org.yb.minicluster.BaseMiniClusterTest;
+import org.yb.minicluster.MiniYBClusterBuilder;
 import org.yb.util.BuildTypeUtil;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
@@ -37,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.function.Consumer;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +72,16 @@ protected enum JedisClientType { JEDIS, JEDISCLUSTER, YBJEDIS };
   protected JedisCommands jedis_client_1;
   private static final Logger LOG = LoggerFactory.getLogger(BaseJedisTest.class);
 
+  protected void createMiniCluster(int numMasters, int numTservers,
+      Map<String, String> additionalMasterFlags, Map<String, String> additionalTserverFlags,
+      Consumer<MiniYBClusterBuilder> customize, Map<String, String> additionalEnvironmentVars)
+      throws Exception {
+    Map<String, String> tserverFlags = new HashMap<>(additionalTserverFlags);
+    tserverFlags.put("start_redis_proxy", "true");
+    super.createMiniCluster(numMasters, numTservers, additionalMasterFlags, tserverFlags, customize,
+        additionalEnvironmentVars);
+  }
+
   class TSValuePairs {
     TSValuePairs(int size) {
       pairs = new HashMap<>();
diff --git a/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/TestYBJedisCluster.java b/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/TestYBJedisCluster.java
index da3630298b49..44a3c4406fe4 100644
--- a/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/TestYBJedisCluster.java
+++ b/java/yb-jedis-tests/src/test/java/com/yugabyte/jedis/TestYBJedisCluster.java
@@ -97,6 +97,7 @@ public void testMovedReply() throws Exception {
     // Add a node and verify our commands succeed.
     LOG.info("Adding a new node ");
     miniCluster.startTServer(ImmutableMap.of(
+        "start_redis_proxy", "true",
         "forward_redis_requests", "false",
         "memory_limit_hard_bytes", String.valueOf(MEMORY_LIMIT)));
 
diff --git a/src/yb/tserver/tablet_server_main_impl.cc b/src/yb/tserver/tablet_server_main_impl.cc
index 485e7afc93b2..3cfa2c2da314 100644
--- a/src/yb/tserver/tablet_server_main_impl.cc
+++ b/src/yb/tserver/tablet_server_main_impl.cc
@@ -95,7 +95,7 @@ using yb::pgwrapper::PgSupervisor;
 using namespace yb::size_literals;  // NOLINT
 using namespace std::chrono_literals;
 
-DEFINE_NON_RUNTIME_bool(start_redis_proxy, true,
+DEFINE_NON_RUNTIME_bool(start_redis_proxy, false,
     "Starts a redis proxy along with the tablet server");
 
 DEFINE_NON_RUNTIME_bool(start_cql_proxy, true, "Starts a CQL proxy along with the tablet server");
diff --git a/src/yb/yql/redis/redisserver/redisserver-test.cc b/src/yb/yql/redis/redisserver/redisserver-test.cc
index b7512806a185..a53276f2e607 100644
--- a/src/yb/yql/redis/redisserver/redisserver-test.cc
+++ b/src/yb/yql/redis/redisserver/redisserver-test.cc
@@ -2546,6 +2546,7 @@ class TestRedisServiceExternal : public TestRedisService {
   void TestPubSub(LocalOrCluster ltype, SubOrUnsub stype, PatternOrChannel ptype);
 
   void CustomizeExternalMiniCluster(ExternalMiniClusterOptions* opts) override {
+    opts->extra_tserver_flags.push_back("--start_redis_proxy=true");
     opts->extra_tserver_flags.push_back(
         "--redis_connection_soft_limit_grace_period_sec=" +
         AsString(static_cast<int>(kSoftLimitGracePeriod.ToSeconds())));