File tree Expand file tree Collapse file tree 3 files changed +3
-5
lines changed
Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -1007,7 +1007,7 @@ int startAppendOnly(void) {
10071007
10081008/* try to Restart AOF after a successful primary-replica full SYNC with
10091009 * existing RDB file. */
1010- int tryRestartAOFAfterSYNCWithRdb (void ) {
1010+ int RestartAOFWithSyncFile (void ) {
10111011 serverAssert (server .aof_state == AOF_OFF );
10121012
10131013 int newfd = -1 , rdbfile_renamed = 0 ;
@@ -1112,9 +1112,7 @@ int tryRestartAOFAfterSYNCWithRdb(void) {
11121112 }
11131113 }
11141114 if (temp_am ) aofManifestFree (temp_am );
1115- if (new_base_filename ) sdsfree (new_base_filename );
11161115 if (new_base_filepath ) sdsfree (new_base_filepath );
1117- if (new_incr_filename ) sdsfree (new_incr_filename );
11181116 if (new_incr_filepath ) sdsfree (new_incr_filepath );
11191117 if (newfd != -1 ) close (newfd );
11201118 return C_ERR ;
Original file line number Diff line number Diff line change @@ -2524,7 +2524,7 @@ void readSyncBulkPayload(connection *conn) {
25242524 /* Restart the AOF subsystem now that we finished the sync. This
25252525 * will trigger an AOF rewrite, and when done will start appending
25262526 * to the new file. */
2527- if (!use_diskless_load && server .aof_enabled && server .aof_use_rdb_preamble ) tryRestartAOFAfterSYNCWithRdb ();
2527+ if (!use_diskless_load && server .aof_enabled && server .aof_use_rdb_preamble ) RestartAOFWithSyncFile ();
25282528
25292529 if (server .aof_enabled && server .aof_state == AOF_OFF ) restartAOFAfterSYNC ();
25302530
Original file line number Diff line number Diff line change @@ -2984,7 +2984,7 @@ int rewriteAppendOnlyFileBackground(void);
29842984int loadAppendOnlyFiles (aofManifest * am );
29852985void stopAppendOnly (void );
29862986int startAppendOnly (void );
2987- int tryRestartAOFAfterSYNCWithRdb (void );
2987+ int RestartAOFWithSyncFile (void );
29882988void backgroundRewriteDoneHandler (int exitcode , int bysignal );
29892989void killAppendOnlyChild (void );
29902990void restartAOFAfterSYNC (void );
You can’t perform that action at this time.
0 commit comments