Merge branch 'master' into get_min_resolved_ts_by_stores

tikv · Aug 31, 2023 · b61256b · b61256b
2 parents 3c7fc08 + 5c9fcf3
commit b61256b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go
@@ -1922,6 +1922,8 @@ func regionErrorToLabel(e *errorpb.Error) string {
 		return "deadline_exceeded"
 	} else if e.GetMismatchPeerId() != nil {
 		return "mismatch_peer_id"
+	} else if e.GetBucketVersionNotMatch() != nil {
+		return "bucket_version_not_match"
 	}
 	return "unknown"
 }
@@ -2079,7 +2081,8 @@ func (s *RegionRequestSender) onRegionError(
 	if bucketVersionNotMatch := regionErr.GetBucketVersionNotMatch(); bucketVersionNotMatch != nil {
 		logutil.Logger(bo.GetCtx()).Debug(
 			"tikv reports `BucketVersionNotMatch` retry later",
-			zap.Stringer("bucketVersionNotMatch", bucketVersionNotMatch),
+			zap.Uint64("latest bucket version", bucketVersionNotMatch.GetVersion()),
+			zap.Uint64("request bucket version", ctx.BucketVersion),
 			zap.Stringer("ctx", ctx),
 		)
 		// bucket version is not match, we should split this cop request again.