fix: update test cases

Signed-off-by: arthur.lee <[email protected]>

Author: arthurkiller

src/aof.c

@@ -1476,19 +1476,15 @@ int loadSingleAppendOnlyFile(char *filename) {
                     memcpy(server.replid, rsi.repl_id, sizeof(server.replid));
                     server.primary_repl_offset = rsi.repl_offset;
                     if (!server.primary && !server.cached_primary) {
-                        /* we will only cache primary if replica did not synced to its primary node yet */
+                        /* only cache myself primary if replica did not synced to its primary node yet */
                         replicationCachePrimaryUsingMyself();
                         selectDb(server.cached_primary, rsi.repl_stream_db);
                     }
                     serverLog(LL_NOTICE, "Loading preamble rdb changed replication info, replid: %s, primary_repl_offset: %lld",
                               server.replid, server.primary_repl_offset);
                 } else {
-                    /* If this is a primary, we can save the replication info
-                     * as secondary ID and offset, in order to allow replicas
-                     * to partial resynchronizations with primaries. */
                     memcpy(server.replid2, rsi.repl_id, sizeof(server.replid));
                     server.second_replid_offset = rsi.repl_offset + 1;
-                    /* Rebase primary_repl_offset from rsi.repl_offset. */
                     server.primary_repl_offset += rsi.repl_offset;
                     serverAssert(server.repl_backlog);
                     server.repl_backlog->offset = server.primary_repl_offset - server.repl_backlog->histlen + 1;

tests/integration/replication-4.tcl

@@ -308,9 +308,12 @@ start_server {tags {"repl"} overrides {appendonly yes}} {
         for {set k 0} {$k < 100} {incr k} {
             $master set foo_$k bar_$k
         }
+        $master config rewrite
+        $replica config rewrite
         wait_for_sync $replica
         # save replid for both master and slave
         set old_replid [status $master master_replid]
+        set old_repl_offset [status $master master_repl_offset]
         waitForBgrewriteaof $master
         waitForBgrewriteaof $replica
 
@@ -320,7 +323,9 @@ start_server {tags {"repl"} overrides {appendonly yes}} {
 
             restart_server $replica_id true false
             set replica [srv $replica_id client]
-            assert_equal [status $replica master_replid2] $old_replid
+
+            assert_equal [status $replica master_replid] $old_replid
+            assert_equal [status $replica master_repl_offset] $old_repl_offset
         }
 
         test {master save replid info into rdb and load it after restart} {
@@ -329,7 +334,10 @@ start_server {tags {"repl"} overrides {appendonly yes}} {
 
             restart_server $master_id true false
             set master [srv $master_id client]
+            set old_repl_offset [expr {$old_repl_offset+1}]
+
             assert_equal [status $master master_replid2] $old_replid
+            assert_equal [status $master second_repl_offset] $old_repl_offset
         }
     }
 }