From 967c94993b4d1b6cb5f24630e4a17f78e154b6c9 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Tue, 25 Aug 2020 14:01:41 +0800 Subject: [PATCH 1/2] cherry pick #468 to release-5.0 Signed-off-by: ti-srebot --- pkg/backup/client.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/backup/client.go b/pkg/backup/client.go index 90f4e5298..4b85a3f10 100644 --- a/pkg/backup/client.go +++ b/pkg/backup/client.go @@ -987,8 +987,11 @@ func CollectChecksums(backupMeta *kvproto.BackupMeta) ([]Checksum, error) { return checksums, nil } +<<<<<<< HEAD // isRetryableError represents whether we should retry reset grpc connection. func isRetryableError(err error) bool { return status.Code(err) == codes.Unavailable || status.Code(err) == codes.Canceled } +======= +>>>>>>> 64271cf... test: fix br incremental index not stable (#468) From f4952d29993c166cf35c6994ac18efd0ac1e2d01 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Fri, 25 Dec 2020 14:50:19 +0800 Subject: [PATCH 2/2] Update client.go --- pkg/backup/client.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/backup/client.go b/pkg/backup/client.go index 4b85a3f10..24aef8a53 100644 --- a/pkg/backup/client.go +++ b/pkg/backup/client.go @@ -987,11 +987,9 @@ func CollectChecksums(backupMeta *kvproto.BackupMeta) ([]Checksum, error) { return checksums, nil } -<<<<<<< HEAD // isRetryableError represents whether we should retry reset grpc connection. func isRetryableError(err error) bool { return status.Code(err) == codes.Unavailable || status.Code(err) == codes.Canceled } -======= ->>>>>>> 64271cf... test: fix br incremental index not stable (#468) +