remove repl-flow-control-enabled

Signed-off-by: xbasel <[email protected]>

Author: xbasel

src/config.c

@@ -3193,7 +3193,6 @@ standardConfig static_configs[] = {
     createBoolConfig("cluster-slot-stats-enabled", NULL, MODIFIABLE_CONFIG, server.cluster_slot_stats_enabled, 0, NULL, NULL),
     createBoolConfig("hide-user-data-from-log", NULL, MODIFIABLE_CONFIG, server.hide_user_data_from_log, 1, NULL, NULL),
     createBoolConfig("import-mode", NULL, DEBUG_CONFIG | MODIFIABLE_CONFIG, server.import_mode, 0, NULL, NULL),
-    createBoolConfig("repl-flow-control-enabled", NULL, MODIFIABLE_CONFIG, server.repl_flow_control_enabled, 1, NULL, NULL),
 
     /* String Configs */
     createStringConfig("aclfile", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.acl_filename, "", NULL, NULL),

src/networking.c

@@ -3275,7 +3275,7 @@ void readToQueryBuf(client *c) {
  */
 int shouldRepeatRead(client *c, int iteration) {
     // If the client is not a primary replica, is closing, or flow control is disabled, no more reads.
-    if (!(c->flag.primary) || c->flag.close_asap || !server.repl_flow_control_enabled) {
+    if (!(c->flag.primary) || c->flag.close_asap || server.repl_max_reads_per_io_event == 1) {
         return 0;
     }
 

src/server.h

@@ -52,6 +52,7 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <signal.h>
+#include <stdbool.h>
 
 #ifdef HAVE_LIBSYSTEMD
 #include <systemd/sd-daemon.h>
@@ -135,7 +136,8 @@ struct hdr_histogram;
 #define CONFIG_BGSAVE_RETRY_DELAY 5              /* Wait a few secs before trying again. */
 #define CONFIG_DEFAULT_PID_FILE "/var/run/valkey.pid"
 #define CONFIG_DEFAULT_BINDADDR_COUNT 2
-#define CONFIG_DEFAULT_BINDADDR {"*", "-::*"}
+#define CONFIG_DEFAULT_BINDADDR \
+    { "*", "-::*" }
 #define NET_HOST_STR_LEN 256                          /* Longest valid hostname */
 #define NET_IP_STR_LEN 46                             /* INET6_ADDRSTRLEN is 46, but we need to be sure */
 #define NET_ADDR_STR_LEN (NET_IP_STR_LEN + 32)        /* Must be enough for ip:port */
@@ -1444,7 +1446,8 @@ typedef struct rdbSaveInfo {
     long long repl_offset;                /* Replication offset. */
 } rdbSaveInfo;
 
-#define RDB_SAVE_INFO_INIT {-1, 0, "0000000000000000000000000000000000000000", -1}
+#define RDB_SAVE_INFO_INIT \
+    { -1, 0, "0000000000000000000000000000000000000000", -1 }
 
 struct malloc_stats {
     size_t zmalloc_used;
@@ -2148,7 +2151,6 @@ struct valkeyServer {
     char *debug_context; /* A free-form string that has no impact on server except being included in a crash report. */
 
     /* Replication flow control */
-    int repl_flow_control_enabled;   /* Enables adaptive flow control for replication reads on the replica */
     int repl_max_reads_per_io_event; /* Maximum allowed reads from the primary file descriptor per I/O event */
 };
 

valkey.conf

@@ -2538,19 +2538,9 @@ jemalloc-bg-thread yes
 
 ################################## REPLICATION FLOW CONTROL ##################################
 
-# Prioritizes replication traffic to reduce primary buffer overflows,
-# reducing lag and the risk of full syncs. Allows the replica to
-# consume data faster under high load.
-#
-# If enabled, the replica invokes multiple reads per I/O event when it
-# detects replication pressure.
-#
-# Default: yes
-# repl-flow-control-enabled yes
-
-# Specifies the maximum number of replication reads allowed per I/O event.
-# Higher values allow more replication data to be processed per event, reducing replication lag,
-# but can throttle normal clients and increase their latency.
+# Controls how aggressively the replica prioritizes replication reads over normal clients.
+# Higher values allow more replication data to be processed per I/O event, reducing lag and risk of full syncs.
+# A value of 1 effectively disables the feature.
 #
 # Default: 25
 # repl-max-reads-per-io-event 25