[fix #389] move CircuitBreaker to TiSession (#390) (#391)

* cherry pick #390 to release-3.1
Co-authored-by: Jian Zhang <zjsariel@gmail.com>
Co-authored-by: Liangliang Gu <marsishandsome@gmail.com>
This commit is contained in:
ti-srebot 2021-12-11 20:30:06 +08:00 committed by GitHub
parent ccf9fa2697
commit 83fb5f4d46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions

View File

@ -28,7 +28,7 @@ public class ConfigUtils {
public static final String TIKV_GRPC_SCAN_BATCH_SIZE = "tikv.grpc.scan_batch_size";
public static final String TIKV_GRPC_MAX_FRAME_SIZE = "tikv.grpc.max_frame_size";
public static final String TIKV_GRPC_IDLE_TIMEOUT = "tikv.grpc.idle_timeout";
public static final String TIKV_INDEX_SCAN_BATCH_SIZE = "tikv.index.scan_batch_size";
public static final String TIKV_INDEX_SCAN_CONCURRENCY = "tikv.index.scan_concurrency";
public static final String TIKV_TABLE_SCAN_CONCURRENCY = "tikv.table.scan_concurrency";

View File

@ -42,6 +42,8 @@ import org.tikv.common.util.*;
import org.tikv.kvproto.Metapb;
import org.tikv.raw.RawKVClient;
import org.tikv.raw.SmartRawKVClient;
import org.tikv.service.failsafe.CircuitBreaker;
import org.tikv.service.failsafe.CircuitBreakerImpl;
import org.tikv.txn.KVClient;
import org.tikv.txn.TxnKVClient;
@ -70,6 +72,7 @@ public class TiSession implements AutoCloseable {
private volatile RegionStoreClient.RegionStoreClientBuilder clientBuilder;
private volatile boolean isClosed = false;
private MetricsServer metricsServer;
private final CircuitBreaker circuitBreaker;
public TiSession(TiConfiguration conf) {
// may throw org.tikv.common.MetricsServer - http server not up
@ -84,6 +87,7 @@ public class TiSession implements AutoCloseable {
logger.info("enable grpc forward for high available");
}
warmUp();
this.circuitBreaker = new CircuitBreakerImpl(conf);
logger.info("TiSession initialized in " + conf.getKvMode() + " mode");
}
@ -150,7 +154,7 @@ public class TiSession implements AutoCloseable {
public SmartRawKVClient createSmartRawClient() {
RawKVClient rawKVClient = createRawClient();
return new SmartRawKVClient(rawKVClient, getConf());
return new SmartRawKVClient(rawKVClient, circuitBreaker);
}
public KVClient createKVClient() {

View File

@ -22,12 +22,10 @@ import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tikv.common.TiConfiguration;
import org.tikv.common.exception.CircuitBreakerOpenException;
import org.tikv.common.util.ScanOption;
import org.tikv.kvproto.Kvrpcpb;
import org.tikv.service.failsafe.CircuitBreaker;
import org.tikv.service.failsafe.CircuitBreakerImpl;
public class SmartRawKVClient implements RawKVClientBase {
private static final Logger logger = LoggerFactory.getLogger(SmartRawKVClient.class);
@ -63,9 +61,9 @@ public class SmartRawKVClient implements RawKVClientBase {
private final RawKVClientBase client;
private final CircuitBreaker circuitBreaker;
public SmartRawKVClient(RawKVClientBase client, TiConfiguration conf) {
public SmartRawKVClient(RawKVClientBase client, CircuitBreaker breaker) {
this.client = client;
this.circuitBreaker = new CircuitBreakerImpl(conf);
this.circuitBreaker = breaker;
}
@Override

View File

@ -72,6 +72,13 @@ public class SmartRawKVClientTest {
}
}
@Test
public void testMultiClients() {
for (int i = 0; i < 10240; i++) {
client = session.createSmartRawClient();
}
}
private void success() {
client.get(ByteString.copyFromUtf8("key"));
}