chore: rename config field name

apache · Nov 15, 2024 · 19ea612 · 19ea612
1 parent 1db057b
commit 19ea612
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/kvrocks.conf b/kvrocks.conf
@@ -179,14 +179,14 @@ slave-priority 100
 #
 # If the master is unreachable before connecting, not having a timeout may block future
 # 'clusterx setnodes' commands because the replication thread is blocked on connect.
-slave-fullsync-connect-timeout 3100
+slave-fullsync-connect-timeout-ms 3100
 
 # Change the default timeout in milliseconds for socket recv during fullsync.
 # The default value is 3200, and 0 means no timeout.
 #
 # If the master is unreachable when fetching SST files, not having a timeout may block
 # future 'clusterx setnodes' commands because the replication thread is blocked on recv.
-slave-fullsync-recv-timeout 3200
+slave-fullsync-recv-timeout-ms 3200
 
 # TCP listen() backlog.
 #

diff --git a/src/cluster/replication.cc b/src/cluster/replication.cc
@@ -778,8 +778,8 @@ Status ReplicationThread::parallelFetchFile(const std::string &dir,
           auto exit = MakeScopeExit([ssl] { SSL_free(ssl); });
 #endif
           int sock_fd = GET_OR_RET(util::SockConnect(this->host_, this->port_, ssl,
-                                                     this->srv_->GetConfig()->slave_fullsync_connect_timeout,
-                                                     this->srv_->GetConfig()->slave_fullsync_recv_timeout)
+                                                     this->srv_->GetConfig()->slave_fullsync_connect_timeout_ms,
+                                                     this->srv_->GetConfig()->slave_fullsync_recv_timeout_ms)
                                        .Prefixed("connect the server err"));
 #ifdef ENABLE_OPENSSL
           exit.Disable();

diff --git a/src/config/config.cc b/src/config/config.cc
@@ -203,8 +203,8 @@ Config::Config() {
       {"slave-empty-db-before-fullsync", false, new YesNoField(&slave_empty_db_before_fullsync, false)},
       {"slave-priority", false, new IntField(&slave_priority, 100, 0, INT_MAX)},
       {"slave-read-only", false, new YesNoField(&slave_readonly, true)},
-      {"slave-fullsync-connect-timeout", false, new IntField(&slave_fullsync_connect_timeout, 3100, 0, INT_MAX)},
-      {"slave-fullsync-recv-timeout", false, new IntField(&slave_fullsync_recv_timeout, 3200, 0, INT_MAX)},
+      {"slave-fullsync-connect-timeout-ms", false, new IntField(&slave_fullsync_connect_timeout_ms, 3100, 0, INT_MAX)},
+      {"slave-fullsync-recv-timeout-ms", false, new IntField(&slave_fullsync_recv_timeout_ms, 3200, 0, INT_MAX)},
       {"use-rsid-psync", true, new YesNoField(&use_rsid_psync, false)},
       {"profiling-sample-ratio", false, new IntField(&profiling_sample_ratio, 0, 0, 100)},
       {"profiling-sample-record-max-len", false, new IntField(&profiling_sample_record_max_len, 256, 0, INT_MAX)},

diff --git a/src/config/config.h b/src/config/config.h
@@ -104,8 +104,8 @@ struct Config {
   bool slave_readonly = true;
   bool slave_serve_stale_data = true;
   bool slave_empty_db_before_fullsync = false;
-  int slave_fullsync_connect_timeout = 3200;
-  int slave_fullsync_recv_timeout = 3100;
+  int slave_fullsync_connect_timeout_ms = 3200;
+  int slave_fullsync_recv_timeout_ms = 3100;
   int slave_priority = 100;
   int max_db_size = 0;
   int max_replication_mb = 0;