cherry pick pingcap#35641 to release-6.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jun 23, 2022 · fc2f6f4 · fc2f6f4
1 parent 40f19cb
commit fc2f6f4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/br/pkg/task/restore_raw.go b/br/pkg/task/restore_raw.go
@@ -146,8 +146,7 @@ func RunRestoreRaw(c context.Context, g glue.Glue, cmdName string, cfg *RestoreR
 		!cfg.LogProgress)
 
 	// RawKV restore does not need to rewrite keys.
-	rewrite := &restore.RewriteRules{}
-	err = restore.SplitRanges(ctx, client, ranges, rewrite, updateCh, true)
+	err = restore.SplitRanges(ctx, client, ranges, nil, updateCh, true)
 	if err != nil {
 		return errors.Trace(err)
 	}

diff --git a/br/tests/br_rawkv/run.sh b/br/tests/br_rawkv/run.sh
@@ -98,12 +98,23 @@ run_test() {
         --key "$TEST_DIR/certs/br.key" \
         --mode put --put-data "311121:31, 31112100:32, 311122:33, 31112200:34, 3111220000:35, 311123:36"
 
+
+    # put some keys starts with t. https://github.com/pingcap/tidb/issues/35279
+    # t_128_r_12 --<hex encode>--> 745f3132385f725f3132
+    # t_128_r_13 --<hex encode>--> 745f3132385f725f3133
+    bin/rawkv --pd $PD_ADDR \
+        --ca "$TEST_DIR/certs/ca.pem" \
+        --cert "$TEST_DIR/certs/br.pem" \
+        --key "$TEST_DIR/certs/br.key" \
+        --mode put --put-data "745f3132385f725f3132:31, 745f3132385f725f3133:32"
+
     checksum_ori=$(checksum 31 3130303030303030)
     checksum_partial=$(checksum 311111 311122)
+    checksum_t_prefix=$(checksum 745f3132385f725f3131 745f3132385f725f3134)
 
     # backup rawkv
     echo "backup start..."
-    run_br --pd $PD_ADDR backup raw -s "local://$BACKUP_DIR" --start 31 --end 3130303030303030 --format hex --concurrency 4 --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    run_br --pd $PD_ADDR backup raw -s "local://$BACKUP_DIR" --start 31 --end 745f3132385f725f3134 --format hex --concurrency 4 --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
 
     # delete data in range[start-key, end-key)
     clean 31 3130303030303030
@@ -153,6 +164,21 @@ run_test() {
         fail_and_exit
     fi
 
+    echo "t prefix restore start..."
+    run_br --pd $PD_ADDR restore raw -s "local://$BACKUP_DIR" --start "745f3132385f725f3131" --end "745f3132385f725f3134" --format hex --concurrency 4 --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    bin/rawkv --pd $PD_ADDR \
+        --ca "$TEST_DIR/certs/ca.pem" \
+        --cert "$TEST_DIR/certs/br.pem" \
+        --key "$TEST_DIR/certs/br.key" \
+        --mode scan --start-key 745f3132385f725f3131 --end-key 745f3132385f725f3134
+
+    checksum_new=$(checksum 745f3132385f725f3131 745f3132385f725f3134)
+
+    if [ "$checksum_new" != "$checksum_t_prefix" ];then
+        echo "checksum failed after restore"
+        fail_and_exit
+    fi
+
     export GO_FAILPOINTS=""
 }