From 01b391ff2fb0a4abe001a1806b822863b9f70086 Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Fri, 4 Jun 2021 12:24:23 +0800 Subject: [PATCH] cherry pick #172 to release-3.1 (#175) Signed-off-by: ti-srebot Co-authored-by: birdstorm --- src/main/java/org/tikv/common/exception/RegionException.java | 2 +- src/main/java/org/tikv/common/operation/KVErrorHandler.java | 4 +--- src/main/java/org/tikv/common/util/Batch.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/tikv/common/exception/RegionException.java b/src/main/java/org/tikv/common/exception/RegionException.java index d94b410519..3a8dd97737 100644 --- a/src/main/java/org/tikv/common/exception/RegionException.java +++ b/src/main/java/org/tikv/common/exception/RegionException.java @@ -24,7 +24,7 @@ public class RegionException extends TiKVException { private final Error regionErr; public RegionException(Error regionErr) { - super("Region Exception occurred" + regionErr.getMessage()); + super("Region Exception occurred " + regionErr.getMessage()); this.regionErr = regionErr; } diff --git a/src/main/java/org/tikv/common/operation/KVErrorHandler.java b/src/main/java/org/tikv/common/operation/KVErrorHandler.java index 35631e3dbc..55bbdef44e 100644 --- a/src/main/java/org/tikv/common/operation/KVErrorHandler.java +++ b/src/main/java/org/tikv/common/operation/KVErrorHandler.java @@ -123,9 +123,7 @@ public class KVErrorHandler implements ErrorHandler { @Override public boolean handleResponseError(BackOffer backOffer, RespT resp) { if (resp == null) { - String msg = - String.format( - "Request Failed with unknown reason for region region [%s]", recv.getRegion()); + String msg = String.format("Request Failed with unknown reason for [%s]", recv.getRegion()); logger.warn(msg); return handleRequestError(backOffer, new GrpcException(msg)); } diff --git a/src/main/java/org/tikv/common/util/Batch.java b/src/main/java/org/tikv/common/util/Batch.java index 5f8e63886e..2c9f161bf3 100644 --- a/src/main/java/org/tikv/common/util/Batch.java +++ b/src/main/java/org/tikv/common/util/Batch.java @@ -56,7 +56,7 @@ public class Batch { } public BackOffer getBackOffer() { - return backOffer; + return ConcreteBackOffer.create(backOffer); } public TiRegion getRegion() {