Skip to content

fix SmartRawKVClient close (#393) #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marsishandsome merged 2 commits into from
Dec 11, 2021
Merged

fix SmartRawKVClient close (#393) #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f4b3d4
cherry pick #393 to release-3.1
marsishandsome Dec 11, 2021
f352a6d
fix test
marsishandsome Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/org/tikv/common/TiSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,10 @@ private synchronized void shutdown(boolean now) throws Exception {
if (metricsServer != null) {
metricsServer.close();
}

if (circuitBreaker != null) {
circuitBreaker.close();
}
}

if (now) {
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/tikv/raw/SmartRawKVClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -268,6 +262,11 @@ private void callWithCircuitBreaker(String funcName, Function0 func) {
});
}

@Override
public void close() throws Exception {
client.close();
}

public interface Function1<T> {
T apply();
}
Expand Down