From 518776f948ff9531a8d84353d67143f1d987235c Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 16:46:51 +0800
Subject: [PATCH 01/15] br: fix the split issue in txn restore

---
 br/pkg/task/restore_txn.go |  2 +-
 br/tests/br_rawkv/run.sh   | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/br/pkg/task/restore_txn.go b/br/pkg/task/restore_txn.go
index 40ab734cbcd52..7fe38c2bb7f32 100644
--- a/br/pkg/task/restore_txn.go
+++ b/br/pkg/task/restore_txn.go
@@ -87,7 +87,7 @@ func RunRestoreTxn(c context.Context, g glue.Glue, cmdName string, cfg *Config)
 		!cfg.LogProgress)
 
 	// RawKV restore does not need to rewrite keys.
-	err = restore.SplitRanges(ctx, client, ranges, nil, updateCh, true)
+	err = restore.SplitRanges(ctx, client, ranges, nil, updateCh, false)
 	if err != nil {
 		return errors.Trace(err)
 	}
diff --git a/br/tests/br_rawkv/run.sh b/br/tests/br_rawkv/run.sh
index de7e2b702868b..0e398896b7bd6 100755
--- a/br/tests/br_rawkv/run.sh
+++ b/br/tests/br_rawkv/run.sh
@@ -22,6 +22,7 @@ start_services --no-tiflash
 
 BACKUP_DIR=$TEST_DIR/"raw_backup"
 BACKUP_FULL=$TEST_DIR/"rawkv-full"
+BACKUP_TXN_FULL=$TEST_DIR/"txnkv-full"
 
 checksum() {
     bin/rawkv --pd $PD_ADDR \
@@ -44,6 +45,32 @@ clean() {
     --mode delete --start-key $1 --end-key $2
 }
 
+test_full_txnkv() {
+    check_range_start=00
+    check_range_end=ff
+
+    rm -rf $BACKUP_TXN_FULL
+
+    checksum_full=$(checksum $check_range_start $check_range_end)
+    # backup current state of key-values
+    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+
+    clean $check_range_start $check_range_end
+    # Ensure the data is deleted
+    checksum_new=$(checksum $check_range_start $check_range_end)
+    if [ "$checksum_new" == "$checksum_full" ];then
+        echo "failed to delete data in range"
+        fail_and_exit
+    fi
+
+    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    checksum_new=$(checksum $check_range_start $check_range_end)
+    if [ "$checksum_new" != "$checksum_full" ];then
+        echo "failed to restore"
+        fail_and_exit
+    fi
+}
+
 test_full_rawkv() {
     check_range_start=00
     check_range_end=ff
@@ -137,6 +164,7 @@ run_test() {
     fi
 
     test_full_rawkv
+    test_full_txnkv
 
     # delete data in range[start-key, end-key)
     clean 31 3130303030303030

From 743410ca9fc0840ac489fd5c24cd20614e9a07f9 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 17:01:13 +0800
Subject: [PATCH 02/15] update test

---
 br/tests/br_full/run.sh  | 10 ++++++++++
 br/tests/br_rawkv/run.sh | 27 ---------------------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/br/tests/br_full/run.sh b/br/tests/br_full/run.sh
index e1325a8d4812e..b4d0e487a4dc9 100755
--- a/br/tests/br_full/run.sh
+++ b/br/tests/br_full/run.sh
@@ -73,6 +73,15 @@ if [ "$size_lz4" -le "$size_zstd" ]; then
   exit -1
 fi
 
+# backup txn
+echo "backup txn start..."
+run_br --pd $PD_ADDR backup txn -s "local://$TEST_DIR/$DB-txn" 
+
+for i in $(seq $DB_COUNT); do
+      run_sql "DROP DATABASE $DB${i};"
+  done
+run_br --pd $PD_ADDR restore txn -s "local://$TEST_DIR/$DB-txn"
+
 for ct in limit lz4 zstd; do
   for i in $(seq $DB_COUNT); do
       run_sql "DROP DATABASE $DB${i};"
@@ -107,3 +116,4 @@ done
 for i in $(seq $DB_COUNT); do
     run_sql "DROP DATABASE $DB${i};"
 done
+
diff --git a/br/tests/br_rawkv/run.sh b/br/tests/br_rawkv/run.sh
index 0e398896b7bd6..ae73eec2e7de1 100755
--- a/br/tests/br_rawkv/run.sh
+++ b/br/tests/br_rawkv/run.sh
@@ -71,32 +71,6 @@ test_full_txnkv() {
     fi
 }
 
-test_full_rawkv() {
-    check_range_start=00
-    check_range_end=ff
-
-    rm -rf $BACKUP_FULL
-
-    checksum_full=$(checksum $check_range_start $check_range_end)
-    # backup current state of key-values
-    run_br --pd $PD_ADDR backup raw -s "local://$BACKUP_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
-
-    clean $check_range_start $check_range_end
-    # Ensure the data is deleted
-    checksum_new=$(checksum $check_range_start $check_range_end)
-    if [ "$checksum_new" == "$checksum_full" ];then
-        echo "failed to delete data in range"
-        fail_and_exit
-    fi
-
-    run_br --pd $PD_ADDR restore raw -s "local://$BACKUP_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
-    checksum_new=$(checksum $check_range_start $check_range_end)
-    if [ "$checksum_new" != "$checksum_full" ];then
-        echo "failed to restore"
-        fail_and_exit
-    fi
-}
-
 checksum_empty=$(checksum 31 3130303030303030)
 
 run_test() {
@@ -164,7 +138,6 @@ run_test() {
     fi
 
     test_full_rawkv
-    test_full_txnkv
 
     # delete data in range[start-key, end-key)
     clean 31 3130303030303030

From 54795bc03d74d78a3d09b6e769e7e7cdb5f1b170 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 17:48:17 +0800
Subject: [PATCH 03/15] update test

---
 Makefile                    |   1 +
 br/tests/br_txn/BUILD.bazel |  21 +++
 br/tests/br_txn/client.go   | 270 ++++++++++++++++++++++++++++++++++++
 br/tests/br_txn/run.sh      | 142 +++++++++++++++++++
 4 files changed, 434 insertions(+)
 create mode 100644 br/tests/br_txn/BUILD.bazel
 create mode 100644 br/tests/br_txn/client.go
 create mode 100755 br/tests/br_txn/run.sh

diff --git a/Makefile b/Makefile
index 9a919f0e28f43..dc9a48454ccd0 100644
--- a/Makefile
+++ b/Makefile
@@ -329,6 +329,7 @@ build_for_br_integration_test:
 	$(GOBUILD) $(RACE_FLAG) -o bin/gc br/tests/br_z_gc_safepoint/*.go && \
 	$(GOBUILD) $(RACE_FLAG) -o bin/oauth br/tests/br_gcs/*.go && \
 	$(GOBUILD) $(RACE_FLAG) -o bin/rawkv br/tests/br_rawkv/*.go && \
+	$(GOBUILD) $(RACE_FLAG) -o bin/txnkv br/tests/br_txnkv/*.go && \
 	$(GOBUILD) $(RACE_FLAG) -o bin/parquet_gen br/tests/lightning_checkpoint_parquet/*.go \
 	) || (make failpoint-disable && exit 1)
 	@make failpoint-disable
diff --git a/br/tests/br_txn/BUILD.bazel b/br/tests/br_txn/BUILD.bazel
new file mode 100644
index 0000000000000..f4153a1651d98
--- /dev/null
+++ b/br/tests/br_txn/BUILD.bazel
@@ -0,0 +1,21 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "br_rawkv_lib",
+    srcs = ["client.go"],
+    importpath = "github.com/pingcap/tidb/br/tests/br_rawkv",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_pingcap_log//:log",
+        "@com_github_tikv_client_go_v2//config",
+        "@com_github_tikv_client_go_v2//rawkv",
+        "@org_uber_go_zap//:zap",
+    ],
+)
+
+go_binary(
+    name = "br_rawkv",
+    embed = [":br_rawkv_lib"],
+    visibility = ["//visibility:public"],
+)
diff --git a/br/tests/br_txn/client.go b/br/tests/br_txn/client.go
new file mode 100644
index 0000000000000..97a599e347756
--- /dev/null
+++ b/br/tests/br_txn/client.go
@@ -0,0 +1,270 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"encoding/hex"
+	"flag"
+	"fmt"
+	"hash/crc64"
+	"math/rand"
+	"time"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
+	"github.com/tikv/client-go/v2/config"
+	"github.com/tikv/client-go/v2/txnkv"
+	"go.uber.org/zap"
+)
+
+var (
+	ca          = flag.String("ca", "", "CA certificate path for TLS connection")
+	cert        = flag.String("cert", "", "certificate path for TLS connection")
+	key         = flag.String("key", "", "private key path for TLS connection")
+	pdAddr      = flag.String("pd", "127.0.0.1:2379", "Address of PD")
+	runMode     = flag.String("mode", "", "Mode. One of 'rand-gen', 'checksum', 'scan', 'delete' and 'put'")
+	startKeyStr = flag.String("start-key", "", "Start key in hex")
+	endKeyStr   = flag.String("end-key", "", "End key in hex")
+	keyMaxLen   = flag.Int("key-max-len", 32, "Max length of keys for rand-gen mode")
+	concurrency = flag.Int("concurrency", 32, "Concurrency to run rand-gen")
+	duration    = flag.Int("duration", 10, "duration(second) of rand-gen")
+	putDataStr  = flag.String("put-data", "", "Kv pairs to put to the cluster in hex. "+
+		"kv pairs are separated by commas, key and value in a pair are separated by a colon")
+)
+
+func createClient(addr string) (*txnkv.Client, error) {
+	if *ca != "" {
+		conf := config.GetGlobalConfig()
+		conf.Security.ClusterSSLCA = *ca
+		conf.Security.ClusterSSLCert = *cert
+		conf.Security.ClusterSSLKey = *key
+		config.StoreGlobalConfig(conf)
+	}
+
+	cli, err := txnkv.NewClient([]string{addr})
+	return cli, errors.Trace(err)
+}
+
+func main() {
+	flag.Parse()
+
+	startKey, err := hex.DecodeString(*startKeyStr)
+	if err != nil {
+		log.Panic("Invalid startKey", zap.String("starkey", *startKeyStr), zap.Error(err))
+	}
+	endKey, err := hex.DecodeString(*endKeyStr)
+	if err != nil {
+		log.Panic("Invalid endKey: %v, err: %+v", zap.String("endkey", *endKeyStr), zap.Error(err))
+	}
+	// For "put" mode, the key range is not used. So no need to throw error here.
+	if len(endKey) == 0 && *runMode != "put" {
+		log.Panic("Empty endKey is not supported yet")
+	}
+
+	if *runMode == "test-rand-key" {
+		testRandKey(startKey, endKey, *keyMaxLen)
+		return
+	}
+
+	client, err := createClient(*pdAddr)
+	if err != nil {
+		log.Panic("Failed to create client", zap.String("pd", *pdAddr), zap.Error(err))
+	}
+
+	switch *runMode {
+	case "rand-gen":
+		err = randGenWithDuration(client, startKey, endKey, *keyMaxLen, *concurrency, *duration)
+	case "checksum":
+		err = checksum(client, startKey, endKey)
+	case "delete":
+		err = deleteRange(client, startKey, endKey)
+	case "put":
+		err = put(client, *putDataStr)
+	}
+
+	if err != nil {
+		log.Panic("Error", zap.Error(err))
+	}
+}
+
+func randGenWithDuration(client *txnkv.Client, startKey, endKey []byte,
+	maxLen int, concurrency int, duration int) error {
+	var err error
+	ok := make(chan struct{})
+	go func() {
+		err = randGen(client, startKey, endKey, maxLen, concurrency)
+		ok <- struct{}{}
+	}()
+	select {
+	case <-time.After(time.Second * time.Duration(duration)):
+	case <-ok:
+	}
+	return errors.Trace(err)
+}
+
+func randGen(client *txnkv.Client, startKey, endKey []byte, maxLen int, concurrency int) error {
+	log.Info("Start rand-gen", zap.Int("maxlen", maxLen),
+		zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey)))
+	log.Info("Rand-gen will keep running. Please Ctrl+C to stop manually.")
+
+	// Cannot generate shorter key than commonPrefix
+	commonPrefixLen := 0
+	for ; commonPrefixLen < len(startKey) && commonPrefixLen < len(endKey) &&
+		startKey[commonPrefixLen] == endKey[commonPrefixLen]; commonPrefixLen++ {
+		continue
+	}
+
+	if maxLen < commonPrefixLen {
+		return errors.Errorf("maxLen (%v) < commonPrefixLen (%v)", maxLen, commonPrefixLen)
+	}
+
+	const batchSize = 32
+
+	errCh := make(chan error, concurrency)
+	for i := 0; i < concurrency; i++ {
+		go func() {
+			for {
+				txn, err := client.Begin()
+				if err != nil {
+					errCh <- errors.Trace(err)
+				}
+				for i := 0; i < batchSize; i++ {
+					key := randKey(startKey, endKey, maxLen)
+					value := randValue()
+
+					txn.Set(key, value)
+				}
+				err = txn.Commit(context.TODO())
+				if err != nil {
+					errCh <- errors.Trace(err)
+				}
+
+			}
+		}()
+	}
+
+	err := <-errCh
+	if err != nil {
+		return errors.Trace(err)
+	}
+
+	return nil
+}
+
+func testRandKey(startKey, endKey []byte, maxLen int) {
+	for {
+		k := randKey(startKey, endKey, maxLen)
+		if bytes.Compare(k, startKey) < 0 || bytes.Compare(k, endKey) >= 0 {
+			panic(hex.EncodeToString(k))
+		}
+	}
+}
+
+//nolint:gosec
+func randKey(startKey, endKey []byte, maxLen int) []byte {
+Retry:
+	for { // Regenerate on fail
+		result := make([]byte, 0, maxLen)
+
+		upperUnbounded := false
+		lowerUnbounded := false
+
+		for i := 0; i < maxLen; i++ {
+			upperBound := 256
+			if !upperUnbounded {
+				if i >= len(endKey) {
+					// The generated key is the same as endKey which is invalid. Regenerate it.
+					continue Retry
+				}
+				upperBound = int(endKey[i]) + 1
+			}
+
+			lowerBound := 0
+			if !lowerUnbounded {
+				if i >= len(startKey) {
+					lowerUnbounded = true
+				} else {
+					lowerBound = int(startKey[i])
+				}
+			}
+
+			if lowerUnbounded {
+				if rand.Intn(257) == 0 {
+					return result
+				}
+			}
+
+			value := rand.Intn(upperBound - lowerBound)
+			value += lowerBound
+
+			if value < upperBound-1 {
+				upperUnbounded = true
+			}
+			if value > lowerBound {
+				lowerUnbounded = true
+			}
+
+			result = append(result, uint8(value))
+		}
+
+		return result
+	}
+}
+
+//nolint:gosec
+func randValue() []byte {
+	result := make([]byte, 0, 512)
+	for i := 0; i < 512; i++ {
+		value := rand.Intn(257)
+		if value == 256 {
+			if i > 0 {
+				return result
+			}
+			value--
+		}
+		result = append(result, uint8(value))
+	}
+	return result
+}
+
+func checksum(client *txnkv.Client, startKey, endKey []byte) error {
+	log.Info("Start checkcum on range",
+		zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey)))
+
+	txn, err := client.Begin()
+	if err != nil {
+		return errors.Trace(err)
+	}
+	iter, err := txn.Iter(startKey, endKey)
+	if err != nil {
+		return errors.Trace(err)
+	}
+
+	digest := crc64.New(crc64.MakeTable(crc64.ECMA))
+
+	var res uint64
+
+	for {
+		err := iter.Next()
+		if err != nil {
+			return errors.Trace(err)
+		}
+		if len(iter.Key()) == 0 {
+			break
+		}
+		_, _ = digest.Write(iter.Key())
+		_, _ = digest.Write(iter.Value())
+		res ^= digest.Sum64()
+	}
+
+	log.Info("Checksum result", zap.Uint64("checksum", res))
+	fmt.Printf("Checksum result: %016x\n", res)
+	return nil
+}
+
+func deleteRange(client *txnkv.Client, startKey, endKey []byte) error {
+	log.Info("Start delete data in range",
+		zap.String("startkey", hex.EncodeToString(startKey)), zap.String("endkey", hex.EncodeToString(endKey)))
+	_, err := client.DeleteRange(context.TODO(), startKey, endKey, *concurrency)
+	return err
+}
diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
new file mode 100755
index 0000000000000..ae66853abf802
--- /dev/null
+++ b/br/tests/br_txn/run.sh
@@ -0,0 +1,142 @@
+#!/bin/sh
+#
+# Copyright 2019 PingCAP, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eux
+
+# restart service without tiflash
+source $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../_utils/run_services
+start_services --no-tiflash
+
+BACKUP_DIR=$TEST_DIR/"txn_backup"
+BACKUP_FULL=$TEST_DIR/"txnkv-full"
+
+checksum() {
+    bin/txnkv --pd $PD_ADDR \
+        --ca "$TEST_DIR/certs/ca.pem" \
+        --cert "$TEST_DIR/certs/br.pem" \
+        --key "$TEST_DIR/certs/br.key" \
+        --mode checksum --start-key $1 --end-key $2 | grep result | awk '{print $3}'
+}
+
+fail_and_exit() {
+    echo "TEST: [$TEST_NAME] failed!"
+    exit 1
+}
+
+clean() {
+    bin/txnkv --pd $PD_ADDR \
+    --ca "$TEST_DIR/certs/ca.pem" \
+    --cert "$TEST_DIR/certs/br.pem" \
+    --key "$TEST_DIR/certs/br.key" \
+    --mode delete --start-key $1 --end-key $2
+}
+
+test_full_txnkv() {
+    check_range_start=00
+    check_range_end=ff
+
+    rm -rf $BACKUP_TXN_FULL
+
+    checksum_full=$(checksum $check_range_start $check_range_end)
+    # backup current state of key-values
+    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+
+    clean $check_range_start $check_range_end
+    # Ensure the data is deleted
+    checksum_new=$(checksum $check_range_start $check_range_end)
+    if [ "$checksum_new" == "$checksum_full" ];then
+        echo "failed to delete data in range"
+        fail_and_exit
+    fi
+
+    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    checksum_new=$(checksum $check_range_start $check_range_end)
+    if [ "$checksum_new" != "$checksum_full" ];then
+        echo "failed to restore"
+        fail_and_exit
+    fi
+}
+
+checksum_empty=$(checksum 31 3130303030303030)
+
+run_test() {
+    if [ -z "$1" ];then
+        echo "run test"
+    else
+        export GO_FAILPOINTS="$1"
+        echo "run test with failpoints: $GO_FAILPOINTS"
+    fi
+
+    rm -rf $BACKUP_DIR
+    clean 31 3130303030303030
+
+    # generate txn kv randomly in range[start-key, end-key) in 10s
+    bin/txnkv --pd $PD_ADDR \
+        --ca "$TEST_DIR/certs/ca.pem" \
+        --cert "$TEST_DIR/certs/br.pem" \
+        --key "$TEST_DIR/certs/br.key" \
+        --mode rand-gen --start-key 31 --end-key 3130303030303030 --duration 10
+
+    checksum_ori=$(checksum 31 3130303030303030)
+
+    # backup txnkv
+    echo "backup start..."
+    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_DIR" --start 31 --end 745f3132385f725f3134 
+
+    # delete data in range[start-key, end-key)
+    clean 31 3130303030303030
+    # Ensure the data is deleted
+    checksum_new=$(checksum 31 3130303030303030)
+
+    if [ "$checksum_new" != "$checksum_empty" ];then
+        echo "failed to delete data in range"
+        fail_and_exit
+    fi
+
+    # restore rawkv
+    echo "restore start..."
+    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_DIR" --start 31 --end 3130303030303030 
+
+    checksum_new=$(checksum 31 3130303030303030)
+
+    if [ "$checksum_new" != "$checksum_ori" ];then
+        echo "checksum failed after restore"
+        fail_and_exit
+    fi
+
+    test_full_txnkv
+
+    # delete data in range[start-key, end-key)
+    clean 31 3130303030303030
+    # Ensure the data is deleted
+    checksum_new=$(checksum 31 3130303030303030)
+
+    if [ "$checksum_new" != "$checksum_empty" ];then
+        echo "failed to delete data in range"
+        fail_and_exit
+    fi
+
+    checksum_new=$(checksum 31 3130303030303030)
+
+    if [ "$checksum_new" != "$checksum_partial" ];then
+        echo "checksum failed after restore"
+        fail_and_exit
+    fi
+    export GO_FAILPOINTS=""
+}
+
+
+run_test ""

From d2232995dbcdfa6a597737a6e9fe8ea679e64108 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 18:08:41 +0800
Subject: [PATCH 04/15] update

---
 br/tests/br_txn/run.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
index ae66853abf802..432517fc0f99b 100755
--- a/br/tests/br_txn/run.sh
+++ b/br/tests/br_txn/run.sh
@@ -138,5 +138,4 @@ run_test() {
     export GO_FAILPOINTS=""
 }
 
-
 run_test ""

From 2fdc870daafcb08b452a2c5a837e5396aa571984 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 18:11:50 +0800
Subject: [PATCH 05/15] update

---
 br/tests/br_full/run.sh       | 10 ----------
 br/tests/br_rawkv/BUILD.bazel | 21 ---------------------
 br/tests/br_rawkv/run.sh      |  8 ++++----
 br/tests/br_txn/run.sh        |  2 +-
 4 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 br/tests/br_rawkv/BUILD.bazel

diff --git a/br/tests/br_full/run.sh b/br/tests/br_full/run.sh
index b4d0e487a4dc9..e1325a8d4812e 100755
--- a/br/tests/br_full/run.sh
+++ b/br/tests/br_full/run.sh
@@ -73,15 +73,6 @@ if [ "$size_lz4" -le "$size_zstd" ]; then
   exit -1
 fi
 
-# backup txn
-echo "backup txn start..."
-run_br --pd $PD_ADDR backup txn -s "local://$TEST_DIR/$DB-txn" 
-
-for i in $(seq $DB_COUNT); do
-      run_sql "DROP DATABASE $DB${i};"
-  done
-run_br --pd $PD_ADDR restore txn -s "local://$TEST_DIR/$DB-txn"
-
 for ct in limit lz4 zstd; do
   for i in $(seq $DB_COUNT); do
       run_sql "DROP DATABASE $DB${i};"
@@ -116,4 +107,3 @@ done
 for i in $(seq $DB_COUNT); do
     run_sql "DROP DATABASE $DB${i};"
 done
-
diff --git a/br/tests/br_rawkv/BUILD.bazel b/br/tests/br_rawkv/BUILD.bazel
deleted file mode 100644
index f4153a1651d98..0000000000000
--- a/br/tests/br_rawkv/BUILD.bazel
+++ /dev/null
@@ -1,21 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-
-go_library(
-    name = "br_rawkv_lib",
-    srcs = ["client.go"],
-    importpath = "github.com/pingcap/tidb/br/tests/br_rawkv",
-    visibility = ["//visibility:private"],
-    deps = [
-        "@com_github_pingcap_errors//:errors",
-        "@com_github_pingcap_log//:log",
-        "@com_github_tikv_client_go_v2//config",
-        "@com_github_tikv_client_go_v2//rawkv",
-        "@org_uber_go_zap//:zap",
-    ],
-)
-
-go_binary(
-    name = "br_rawkv",
-    embed = [":br_rawkv_lib"],
-    visibility = ["//visibility:public"],
-)
diff --git a/br/tests/br_rawkv/run.sh b/br/tests/br_rawkv/run.sh
index ae73eec2e7de1..01734333a4335 100755
--- a/br/tests/br_rawkv/run.sh
+++ b/br/tests/br_rawkv/run.sh
@@ -45,15 +45,15 @@ clean() {
     --mode delete --start-key $1 --end-key $2
 }
 
-test_full_txnkv() {
+test_full_rawkv() {
     check_range_start=00
     check_range_end=ff
 
-    rm -rf $BACKUP_TXN_FULL
+    rm -rf $BACKUP_FULL
 
     checksum_full=$(checksum $check_range_start $check_range_end)
     # backup current state of key-values
-    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    run_br --pd $PD_ADDR backup raw -s "local://$BACKUP_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
 
     clean $check_range_start $check_range_end
     # Ensure the data is deleted
@@ -63,7 +63,7 @@ test_full_txnkv() {
         fail_and_exit
     fi
 
-    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    run_br --pd $PD_ADDR restore raw -s "local://$BACKUP_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
     checksum_new=$(checksum $check_range_start $check_range_end)
     if [ "$checksum_new" != "$checksum_full" ];then
         echo "failed to restore"
diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
index 432517fc0f99b..b09aa219eb123 100755
--- a/br/tests/br_txn/run.sh
+++ b/br/tests/br_txn/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2019 PingCAP, Inc.
+# Copyright 2023 PingCAP, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

From 5852f8ec7ea2fddd5272b33d893ecfb7a012734b Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 18:15:22 +0800
Subject: [PATCH 06/15] update

---
 br/tests/{br_txn => br_rawkv}/BUILD.bazel | 0
 br/tests/br_rawkv/run.sh                  | 1 -
 2 files changed, 1 deletion(-)
 rename br/tests/{br_txn => br_rawkv}/BUILD.bazel (100%)

diff --git a/br/tests/br_txn/BUILD.bazel b/br/tests/br_rawkv/BUILD.bazel
similarity index 100%
rename from br/tests/br_txn/BUILD.bazel
rename to br/tests/br_rawkv/BUILD.bazel
diff --git a/br/tests/br_rawkv/run.sh b/br/tests/br_rawkv/run.sh
index 01734333a4335..de7e2b702868b 100755
--- a/br/tests/br_rawkv/run.sh
+++ b/br/tests/br_rawkv/run.sh
@@ -22,7 +22,6 @@ start_services --no-tiflash
 
 BACKUP_DIR=$TEST_DIR/"raw_backup"
 BACKUP_FULL=$TEST_DIR/"rawkv-full"
-BACKUP_TXN_FULL=$TEST_DIR/"txnkv-full"
 
 checksum() {
     bin/rawkv --pd $PD_ADDR \

From 1bc1bdca4fa04427a17b9f6966588da248c7f4b6 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 18:34:12 +0800
Subject: [PATCH 07/15] udpate group

---
 br/tests/run_group.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/br/tests/run_group.sh b/br/tests/run_group.sh
index 589ed710ec623..8b65bd21197ad 100755
--- a/br/tests/run_group.sh
+++ b/br/tests/run_group.sh
@@ -24,7 +24,7 @@ groups=(
     ["G03"]='br_incompatible_tidb_config br_incremental br_incremental_ddl br_incremental_index'
 	["G04"]='br_incremental_only_ddl br_incremental_same_table br_insert_after_restore br_key_locked br_log_test br_move_backup br_mv_index br_other br_partition_add_index'
 	["G05"]='br_range br_rawkv br_replica_read br_restore_TDE_enable br_restore_log_task_enable br_s3 br_shuffle_leader br_shuffle_region br_single_table'
-	["G06"]='br_skip_checksum br_small_batch_size br_split_region_fail br_systables br_table_filter'
+	["G06"]='br_skip_checksum br_small_batch_size br_split_region_fail br_systables br_table_filter br_txn'
 	["G07"]='br_clustered_index br_crypter br_table_partition br_tidb_placement_policy br_tiflash br_tikv_outage'
 	["G08"]='br_tikv_outage2 br_ttl br_views_and_sequences br_z_gc_safepoint lightning_add_index lightning_alter_random lightning_auto_columns'
 	["G09"]='lightning_auto_random_default lightning_bom_file lightning_character_sets lightning_check_partial_imported lightning_checkpoint lightning_checkpoint_chunks lightning_checkpoint_columns lightning_checkpoint_dirty_tableid'

From 22fd5c895690f5464f654316bed75dcba254d4c7 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 19:10:29 +0800
Subject: [PATCH 08/15] update

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dc9a48454ccd0..6d8ce4b21558f 100644
--- a/Makefile
+++ b/Makefile
@@ -329,7 +329,7 @@ build_for_br_integration_test:
 	$(GOBUILD) $(RACE_FLAG) -o bin/gc br/tests/br_z_gc_safepoint/*.go && \
 	$(GOBUILD) $(RACE_FLAG) -o bin/oauth br/tests/br_gcs/*.go && \
 	$(GOBUILD) $(RACE_FLAG) -o bin/rawkv br/tests/br_rawkv/*.go && \
-	$(GOBUILD) $(RACE_FLAG) -o bin/txnkv br/tests/br_txnkv/*.go && \
+	$(GOBUILD) $(RACE_FLAG) -o bin/txnkv br/tests/br_txn/*.go && \
 	$(GOBUILD) $(RACE_FLAG) -o bin/parquet_gen br/tests/lightning_checkpoint_parquet/*.go \
 	) || (make failpoint-disable && exit 1)
 	@make failpoint-disable

From 1b1119f7097102d54d20519500f363d33bbd4d17 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Tue, 18 Jul 2023 20:05:36 +0800
Subject: [PATCH 09/15] update

---
 br/tests/br_txn/client.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/br/tests/br_txn/client.go b/br/tests/br_txn/client.go
index 97a599e347756..c22d30e12ddc6 100644
--- a/br/tests/br_txn/client.go
+++ b/br/tests/br_txn/client.go
@@ -78,8 +78,6 @@ func main() {
 		err = checksum(client, startKey, endKey)
 	case "delete":
 		err = deleteRange(client, startKey, endKey)
-	case "put":
-		err = put(client, *putDataStr)
 	}
 
 	if err != nil {

From 947b1103e41f102d55583db63654cb13885d5852 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Wed, 19 Jul 2023 14:18:37 +0800
Subject: [PATCH 10/15] fix test

---
 br/tests/br_txn/client.go | 38 ++++++++++++++++++--------------------
 br/tests/br_txn/run.sh    | 36 +++++++++++++++---------------------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/br/tests/br_txn/client.go b/br/tests/br_txn/client.go
index c22d30e12ddc6..6673aab3073ba 100644
--- a/br/tests/br_txn/client.go
+++ b/br/tests/br_txn/client.go
@@ -22,14 +22,12 @@ var (
 	cert        = flag.String("cert", "", "certificate path for TLS connection")
 	key         = flag.String("key", "", "private key path for TLS connection")
 	pdAddr      = flag.String("pd", "127.0.0.1:2379", "Address of PD")
-	runMode     = flag.String("mode", "", "Mode. One of 'rand-gen', 'checksum', 'scan', 'delete' and 'put'")
+	runMode     = flag.String("mode", "", "Mode. One of 'rand-gen', 'checksum', 'scan', 'delete'")
 	startKeyStr = flag.String("start-key", "", "Start key in hex")
 	endKeyStr   = flag.String("end-key", "", "End key in hex")
 	keyMaxLen   = flag.Int("key-max-len", 32, "Max length of keys for rand-gen mode")
 	concurrency = flag.Int("concurrency", 32, "Concurrency to run rand-gen")
 	duration    = flag.Int("duration", 10, "duration(second) of rand-gen")
-	putDataStr  = flag.String("put-data", "", "Kv pairs to put to the cluster in hex. "+
-		"kv pairs are separated by commas, key and value in a pair are separated by a colon")
 )
 
 func createClient(addr string) (*txnkv.Client, error) {
@@ -48,16 +46,9 @@ func createClient(addr string) (*txnkv.Client, error) {
 func main() {
 	flag.Parse()
 
-	startKey, err := hex.DecodeString(*startKeyStr)
-	if err != nil {
-		log.Panic("Invalid startKey", zap.String("starkey", *startKeyStr), zap.Error(err))
-	}
-	endKey, err := hex.DecodeString(*endKeyStr)
-	if err != nil {
-		log.Panic("Invalid endKey: %v, err: %+v", zap.String("endkey", *endKeyStr), zap.Error(err))
-	}
-	// For "put" mode, the key range is not used. So no need to throw error here.
-	if len(endKey) == 0 && *runMode != "put" {
+	startKey := []byte(*startKeyStr)
+	endKey := []byte(*endKeyStr)
+	if len(endKey) == 0 {
 		log.Panic("Empty endKey is not supported yet")
 	}
 
@@ -119,17 +110,18 @@ func randGen(client *txnkv.Client, startKey, endKey []byte, maxLen int, concurre
 	const batchSize = 32
 
 	errCh := make(chan error, concurrency)
-	for i := 0; i < concurrency; i++ {
-		go func() {
+	for i := maxLen; i <= maxLen+concurrency; i++ {
+		go func(i int) {
 			for {
 				txn, err := client.Begin()
 				if err != nil {
 					errCh <- errors.Trace(err)
 				}
-				for i := 0; i < batchSize; i++ {
-					key := randKey(startKey, endKey, maxLen)
+				for j := 0; j < batchSize; j++ {
+					key := randKey(startKey, endKey, i)
+					// append index to avoid write conflict
+					key = appendIndex(key, i)
 					value := randValue()
-
 					txn.Set(key, value)
 				}
 				err = txn.Commit(context.TODO())
@@ -138,7 +130,7 @@ func randGen(client *txnkv.Client, startKey, endKey []byte, maxLen int, concurre
 				}
 
 			}
-		}()
+		}(i)
 	}
 
 	err := <-errCh
@@ -209,6 +201,11 @@ Retry:
 	}
 }
 
+//nolint:gosec
+func appendIndex(key []byte, i int) []byte {
+	return append(key, uint8(i))
+}
+
 //nolint:gosec
 func randValue() []byte {
 	result := make([]byte, 0, 512)
@@ -242,7 +239,7 @@ func checksum(client *txnkv.Client, startKey, endKey []byte) error {
 
 	var res uint64
 
-	for {
+	for iter.Valid() {
 		err := iter.Next()
 		if err != nil {
 			return errors.Trace(err)
@@ -254,6 +251,7 @@ func checksum(client *txnkv.Client, startKey, endKey []byte) error {
 		_, _ = digest.Write(iter.Value())
 		res ^= digest.Sum64()
 	}
+	_ = txn.Commit(context.TODO())
 
 	log.Info("Checksum result", zap.Uint64("checksum", res))
 	fmt.Printf("Checksum result: %016x\n", res)
diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
index b09aa219eb123..a6f8f2c7c2c67 100755
--- a/br/tests/br_txn/run.sh
+++ b/br/tests/br_txn/run.sh
@@ -44,9 +44,9 @@ clean() {
     --mode delete --start-key $1 --end-key $2
 }
 
-test_full_txnkv() {
-    check_range_start=00
-    check_range_end=ff
+test_full_txnkv_encryption() {
+    check_range_start="hello"
+    check_range_end="world"
 
     rm -rf $BACKUP_TXN_FULL
 
@@ -70,7 +70,7 @@ test_full_txnkv() {
     fi
 }
 
-checksum_empty=$(checksum 31 3130303030303030)
+checksum_empty=$(checksum "hello" "world")
 
 run_test() {
     if [ -z "$1" ];then
@@ -81,25 +81,25 @@ run_test() {
     fi
 
     rm -rf $BACKUP_DIR
-    clean 31 3130303030303030
+    clean "hello" "world" 
 
     # generate txn kv randomly in range[start-key, end-key) in 10s
     bin/txnkv --pd $PD_ADDR \
         --ca "$TEST_DIR/certs/ca.pem" \
         --cert "$TEST_DIR/certs/br.pem" \
         --key "$TEST_DIR/certs/br.key" \
-        --mode rand-gen --start-key 31 --end-key 3130303030303030 --duration 10
+        --mode rand-gen --start-key "hello" --end-key "world" --duration 10
 
-    checksum_ori=$(checksum 31 3130303030303030)
+    checksum_ori=$(checksum "hello" "world")
 
     # backup txnkv
     echo "backup start..."
-    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_DIR" --start 31 --end 745f3132385f725f3134 
+    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_DIR" 
 
     # delete data in range[start-key, end-key)
-    clean 31 3130303030303030
+    clean "hello" "world" 
     # Ensure the data is deleted
-    checksum_new=$(checksum 31 3130303030303030)
+    checksum_new=$(checksum "hello" "world")
 
     if [ "$checksum_new" != "$checksum_empty" ];then
         echo "failed to delete data in range"
@@ -108,33 +108,27 @@ run_test() {
 
     # restore rawkv
     echo "restore start..."
-    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_DIR" --start 31 --end 3130303030303030 
+    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_DIR" 
 
-    checksum_new=$(checksum 31 3130303030303030)
+    checksum_new=$(checksum "hello" "world")
 
     if [ "$checksum_new" != "$checksum_ori" ];then
         echo "checksum failed after restore"
         fail_and_exit
     fi
 
-    test_full_txnkv
+    test_full_txnkv_encryption
 
     # delete data in range[start-key, end-key)
-    clean 31 3130303030303030
+    clean "hello" "world"
     # Ensure the data is deleted
-    checksum_new=$(checksum 31 3130303030303030)
+    checksum_new=$(checksum "hello" "world")
 
     if [ "$checksum_new" != "$checksum_empty" ];then
         echo "failed to delete data in range"
         fail_and_exit
     fi
 
-    checksum_new=$(checksum 31 3130303030303030)
-
-    if [ "$checksum_new" != "$checksum_partial" ];then
-        echo "checksum failed after restore"
-        fail_and_exit
-    fi
     export GO_FAILPOINTS=""
 }
 

From 27d1dcbce3f4b9997b9fdae5afbb57590c86d7a0 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Wed, 19 Jul 2023 16:15:57 +0800
Subject: [PATCH 11/15] fix

---
 br/tests/br_txn/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
index a6f8f2c7c2c67..bf6354d96c175 100755
--- a/br/tests/br_txn/run.sh
+++ b/br/tests/br_txn/run.sh
@@ -28,7 +28,7 @@ checksum() {
         --ca "$TEST_DIR/certs/ca.pem" \
         --cert "$TEST_DIR/certs/br.pem" \
         --key "$TEST_DIR/certs/br.key" \
-        --mode checksum --start-key $1 --end-key $2 | grep result | awk '{print $3}'
+        --mode checksum --start-key $1 --end-key $2 | grep result | tail -n 1 | awk '{print $3}'
 }
 
 fail_and_exit() {

From 97d20cba28f0a85423d99377c4896bce42eaff4f Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Wed, 19 Jul 2023 19:38:58 +0800
Subject: [PATCH 12/15] fix test

---
 br/tests/br_txn/run.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
index bf6354d96c175..5cf6608db68c8 100755
--- a/br/tests/br_txn/run.sh
+++ b/br/tests/br_txn/run.sh
@@ -58,7 +58,7 @@ test_full_txnkv_encryption() {
     # Ensure the data is deleted
     checksum_new=$(checksum $check_range_start $check_range_end)
     if [ "$checksum_new" == "$checksum_full" ];then
-        echo "failed to delete data in range"
+        echo "failed to delete data in range in encryption"
         fail_and_exit
     fi
 
@@ -102,7 +102,7 @@ run_test() {
     checksum_new=$(checksum "hello" "world")
 
     if [ "$checksum_new" != "$checksum_empty" ];then
-        echo "failed to delete data in range"
+        echo "failed to delete data in range after backup"
         fail_and_exit
     fi
 
@@ -132,4 +132,6 @@ run_test() {
     export GO_FAILPOINTS=""
 }
 
+# delete data in range[start-key, end-key)
+clean "hello" "world" 
 run_test ""

From 2adeebe5772a5dccc991ea08a8e50980718daee7 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Thu, 20 Jul 2023 10:44:47 +0800
Subject: [PATCH 13/15] fix tess

---
 br/tests/br_txn/run.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/br/tests/br_txn/run.sh b/br/tests/br_txn/run.sh
index 5cf6608db68c8..8b15f78764af4 100755
--- a/br/tests/br_txn/run.sh
+++ b/br/tests/br_txn/run.sh
@@ -48,11 +48,11 @@ test_full_txnkv_encryption() {
     check_range_start="hello"
     check_range_end="world"
 
-    rm -rf $BACKUP_TXN_FULL
+    rm -rf $BACKUP_FULL
 
     checksum_full=$(checksum $check_range_start $check_range_end)
     # backup current state of key-values
-    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    run_br --pd $PD_ADDR backup txn -s "local://$BACKUP_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
 
     clean $check_range_start $check_range_end
     # Ensure the data is deleted
@@ -62,7 +62,7 @@ test_full_txnkv_encryption() {
         fail_and_exit
     fi
 
-    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_TXN_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
+    run_br --pd $PD_ADDR restore txn -s "local://$BACKUP_FULL" --crypter.method "aes128-ctr" --crypter.key "0123456789abcdef0123456789abcdef"
     checksum_new=$(checksum $check_range_start $check_range_end)
     if [ "$checksum_new" != "$checksum_full" ];then
         echo "failed to restore"
@@ -70,8 +70,6 @@ test_full_txnkv_encryption() {
     fi
 }
 
-checksum_empty=$(checksum "hello" "world")
-
 run_test() {
     if [ -z "$1" ];then
         echo "run test"
@@ -134,4 +132,5 @@ run_test() {
 
 # delete data in range[start-key, end-key)
 clean "hello" "world" 
+checksum_empty=$(checksum "hello" "world")
 run_test ""

From c1d233e56470f89c414f80a4f6ef51795ace3d17 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Thu, 20 Jul 2023 11:53:30 +0800
Subject: [PATCH 14/15] bazel prepare

---
 br/tests/br_txn/BUILD.bazel | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 br/tests/br_txn/BUILD.bazel

diff --git a/br/tests/br_txn/BUILD.bazel b/br/tests/br_txn/BUILD.bazel
new file mode 100644
index 0000000000000..911f746718a6e
--- /dev/null
+++ b/br/tests/br_txn/BUILD.bazel
@@ -0,0 +1,21 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "br_txn_lib",
+    srcs = ["client.go"],
+    importpath = "github.com/pingcap/tidb/br/tests/br_txn",
+    visibility = ["//visibility:private"],
+    deps = [
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_pingcap_log//:log",
+        "@com_github_tikv_client_go_v2//config",
+        "@com_github_tikv_client_go_v2//txnkv",
+        "@org_uber_go_zap//:zap",
+    ],
+)
+
+go_binary(
+    name = "br_txn",
+    embed = [":br_txn_lib"],
+    visibility = ["//visibility:public"],
+)

From c0dd36519400bd21301a58ca959343d879de6f19 Mon Sep 17 00:00:00 2001
From: 3pointer <luancheng@pingcap.com>
Date: Thu, 20 Jul 2023 13:57:51 +0800
Subject: [PATCH 15/15] update

---
 br/tests/br_txn/client.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/br/tests/br_txn/client.go b/br/tests/br_txn/client.go
index 6673aab3073ba..6f0bf414e207a 100644
--- a/br/tests/br_txn/client.go
+++ b/br/tests/br_txn/client.go
@@ -122,13 +122,15 @@ func randGen(client *txnkv.Client, startKey, endKey []byte, maxLen int, concurre
 					// append index to avoid write conflict
 					key = appendIndex(key, i)
 					value := randValue()
-					txn.Set(key, value)
+					err = txn.Set(key, value)
+					if err != nil {
+						errCh <- errors.Trace(err)
+					}
 				}
 				err = txn.Commit(context.TODO())
 				if err != nil {
 					errCh <- errors.Trace(err)
 				}
-
 			}
 		}(i)
 	}