Move sendCurentOffsetToReplica to replication.c

naglera · Jan 4, 2024 · be1f66f · be1f66f
1 parent 03d35b6
commit be1f66f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/rdb.c b/src/rdb.c
@@ -60,7 +60,6 @@ char* rdbFileBeingLoaded = NULL; /* used for rdb checking on read error */
 extern int rdbCheckMode;
 void rdbCheckError(const char *fmt, ...);
 void rdbCheckSetError(const char *fmt, ...);
-int sendCurentOffsetToReplica(client* replica);
 
 #ifdef __GNUC__
 void rdbReportError(int corruption_error, int linenum, char *reason, ...) __attribute__ ((format (printf, 3, 4)));
@@ -3500,20 +3499,6 @@ void killRDBChild(void) {
      * - rdbRemoveTempFile */
 }
 
-/* Send to replica End Offset response with structure
- * $ENDOFF:<end-offset> <primary-repl-id> <current-db-id> */
-int sendCurentOffsetToReplica(client* replica) {
-    char buf[128];
-    int buflen;
-    buflen = snprintf(buf, sizeof(buf), "$ENDOFF:%lld %s %d\r\n", server.master_repl_offset, server.replid, server.db->id);
-    serverLog(LL_NOTICE, "Sending to replica %s RDB end offset %lld", replicationGetSlaveName(replica), server.master_repl_offset);    
-    if (connSyncWrite(replica->conn, buf, buflen, server.repl_syncio_timeout*1000) != buflen) {
-        freeClientAsync(replica);
-        return C_ERR;
-    }
-    return C_OK;
-}
-
 /* Spawn an RDB child that writes the RDB to the sockets of the slaves
  * that are currently in SLAVE_STATE_WAIT_BGSAVE_START state. */
 int rdbSaveToSlavesSockets(int req, rdbSaveInfo *rsi) {

diff --git a/src/replication.c b/src/replication.c
@@ -2553,6 +2553,20 @@ int prepareRdbConnectionForRdbLoad(connection *conn) {
     return C_OK;
 }
 
+/* Send to replica End Offset response with structure
+ * $ENDOFF:<end-offset> <primary-repl-id> <current-db-id> */
+int sendCurentOffsetToReplica(client* replica) {
+    char buf[128];
+    int buflen;
+    buflen = snprintf(buf, sizeof(buf), "$ENDOFF:%lld %s %d\r\n", server.master_repl_offset, server.replid, server.db->id);
+    serverLog(LL_NOTICE, "Sending to replica %s RDB end offset %lld", replicationGetSlaveName(replica), server.master_repl_offset);    
+    if (connSyncWrite(replica->conn, buf, buflen, server.repl_syncio_timeout*1000) != buflen) {
+        freeClientAsync(replica);
+        return C_ERR;
+    }
+    return C_OK;
+}
+
 int processEndOffsetResponse(char* response) {
     long long reploffset;
     char master_replid[CONFIG_RUN_ID_SIZE+1];

diff --git a/src/server.h b/src/server.h
@@ -2846,6 +2846,7 @@ int isReplicaRdbChannel(client *c);
 int isOngoingRdbChannelSync(void);
 void abortRdbConnectionSync(int should_retry);
 void incrReadsProcessed(size_t nread);
+int sendCurentOffsetToReplica(client* replica);
 
 /* Generic persistence functions */
 void startLoadingFile(size_t size, char* filename, int rdbflags);