WIP: figure out tcl cases

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

Author: arthurkiller

tests/integration/replication-4.tcl

@@ -295,49 +295,63 @@ start_server {tags {"repl external:skip"}} {
 }
 
 # test aof persistence replid info and load it when reboot server
-start_server {tags {"repl"} overrides {appendonly yes}} {
-    start_server {overrides {appendonly yes}} {
-        set master_id -1
+start_server {tags {"repl external:skip cluster:skip"} overrides {appendonly yes repl-ping-replica-period 10000}} {
+    start_server {overrides {appendonly yes repl-ping-replica-period 10000}} {
+        set primary_id -1
         set replica_id 0
-        set master [srv $master_id client]
-        set master_host [srv $master_id host]
-        set master_port [srv $master_id port]
+        set primary [srv $primary_id client]
+        set primary_host [srv $primary_id host]
+        set primary_port [srv $primary_id port]
         set replica [srv $replica_id client]
 
-        $replica slaveof $master_host $master_port
+        $replica replicaof $primary_host $primary_port
+        $primary config set repl-ping-replica-period 10000
+        $replica config set repl-ping-replica-period 10000
+        $primary config rewrite
+        $replica config rewrite
+
         for {set k 0} {$k < 100} {incr k} {
-            $master set foo_$k bar_$k
+            $primary 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
+
+        wait_for_ofs_sync $primary $replica
+        waitForBgrewriteaof $primary
         waitForBgrewriteaof $replica
+        assert_equal [status $primary sync_full] 1
 
-        test {replica save replid info into rdb and load it after restart} {
+        # save replid for both primary and replica
+        set prev_replid [status $primary master_replid]
+        set prev_repl_offset [status $primary master_repl_offset]
+
+        test {replica rewrite aof and load it after restart} {
             $replica bgrewriteaof
             waitForBgrewriteaof $replica
 
-            restart_server $replica_id true false
+            restart_server $replica_id true true
             set replica [srv $replica_id client]
 
-            assert_equal [status $replica master_replid] $old_replid
-            assert_equal [status $replica master_repl_offset] $old_repl_offset
+            assert_equal [status $replica master_replid] $prev_replid
+            assert_equal [status $replica master_repl_offset] $prev_repl_offset
+
+            wait_for_ofs_sync $primary $replica
+            assert_equal [status $primary sync_full] 1
+            assert_equal [status $primary sync_partial_ok] 1
         }
 
-        test {master save replid info into rdb and load it after restart} {
-            $master bgrewriteaof
-            waitForBgrewriteaof $master
+        test {primary rewrite aof and load it after restart} {
+            $primary bgrewriteaof
+            waitForBgrewriteaof $primary
+
+            restart_server $primary_id true true
+            set primary [srv $primary_id client]
+            set prev_repl_offset [expr {$prev_repl_offset + 1}]
 
-            restart_server $master_id true false
-            set master [srv $master_id client]
-            set old_repl_offset [expr {$old_repl_offset+1}]
+            assert_equal [status $primary master_replid2] $prev_replid
+            assert_equal [status $primary second_repl_offset] $prev_repl_offset
 
-            assert_equal [status $master master_replid2] $old_replid
-            assert_equal [status $master second_repl_offset] $old_repl_offset
+            wait_for_ofs_sync $primary $replica
+            assert_equal [status $primary sync_full] 0
+            assert_equal [status $primary sync_partial_ok] 1
         }
     }
 }