From 2f4b3d455746ae55a8fb3d2ea6dd3355e368ecbc Mon Sep 17 00:00:00 2001 From: Liangliang Gu Date: Sat, 11 Dec 2021 20:41:44 +0800 Subject: [PATCH 1/2] cherry pick #393 to release-3.1 Signed-off-by: ti-srebot --- src/main/java/org/tikv/common/TiSession.java | 4 ++++ src/main/java/org/tikv/raw/SmartRawKVClient.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/org/tikv/common/TiSession.java b/src/main/java/org/tikv/common/TiSession.java index 0cc4b3329d3..f46479df7ec 100644 --- a/src/main/java/org/tikv/common/TiSession.java +++ b/src/main/java/org/tikv/common/TiSession.java @@ -542,6 +542,10 @@ private synchronized void shutdown(boolean now) throws Exception { if (metricsServer != null) { metricsServer.close(); } + + if (circuitBreaker != null) { + circuitBreaker.close(); + } } if (now) { diff --git a/src/main/java/org/tikv/raw/SmartRawKVClient.java b/src/main/java/org/tikv/raw/SmartRawKVClient.java index 02e75625fc5..03e55594b6a 100644 --- a/src/main/java/org/tikv/raw/SmartRawKVClient.java +++ b/src/main/java/org/tikv/raw/SmartRawKVClient.java @@ -268,6 +268,14 @@ private void callWithCircuitBreaker(String funcName, Function0 func) { }); } +<<<<<<< HEAD +======= + @Override + public void close() throws Exception { + client.close(); + } + +>>>>>>> 2657f5a... fix SmartRawKVClient close (#393) public interface Function1 { T apply(); } From f352a6d5c1c8acdb0fbdcdf12c47173cfc0e3d79 Mon Sep 17 00:00:00 2001 From: marsishandsome Date: Sat, 11 Dec 2021 20:46:30 +0800 Subject: [PATCH 2/2] fix test Signed-off-by: marsishandsome --- src/main/java/org/tikv/raw/SmartRawKVClient.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/org/tikv/raw/SmartRawKVClient.java b/src/main/java/org/tikv/raw/SmartRawKVClient.java index 03e55594b6a..31cf97a7364 100644 --- a/src/main/java/org/tikv/raw/SmartRawKVClient.java +++ b/src/main/java/org/tikv/raw/SmartRawKVClient.java @@ -66,12 +66,6 @@ public SmartRawKVClient(RawKVClientBase client, CircuitBreaker breaker) { this.circuitBreaker = breaker; } - @Override - public void close() throws Exception { - circuitBreaker.close(); - client.close(); - } - @Override public void put(ByteString key, ByteString value) { callWithCircuitBreaker("put", () -> client.put(key, value)); @@ -268,14 +262,11 @@ private void callWithCircuitBreaker(String funcName, Function0 func) { }); } -<<<<<<< HEAD -======= @Override public void close() throws Exception { client.close(); } ->>>>>>> 2657f5a... fix SmartRawKVClient close (#393) public interface Function1 { T apply(); }