Support grpc forward #198
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,8 +43,8 @@ | |
| import org.tikv.common.region.RegionStoreClient; | ||
| import org.tikv.common.region.RegionStoreClient.RegionStoreClientBuilder; | ||
| import org.tikv.common.region.TiRegion; | ||
| import org.tikv.common.region.TiStore; | ||
| import org.tikv.common.util.*; | ||
| import org.tikv.raw.RawKVClient; | ||
| import org.tikv.txn.KVClient; | ||
| import org.tikv.txn.TxnKVClient; | ||
|
|
@@ -71,6 +71,7 @@ public class TiSession implements AutoCloseable { | |
| private volatile ExecutorService batchScanThreadPool; | ||
| private volatile ExecutorService deleteRangeThreadPool; | ||
| private volatile RegionManager regionManager; | ||
| private volatile boolean enableGrpcForward; | ||
| private volatile RegionStoreClient.RegionStoreClientBuilder clientBuilder; | ||
| private boolean isClosed = false; | ||
| private HTTPServer server; | ||
|
|
@@ -80,6 +81,7 @@ public TiSession(TiConfiguration conf) { | |
| this.conf = conf; | ||
| this.channelFactory = new ChannelFactory(conf.getMaxFrameSize()); | ||
| this.client = PDClient.createRaw(conf, channelFactory); | ||
| this.enableGrpcForward = conf.getEnableGrpcForward(); | ||
| if (conf.isMetricsEnable()) { | ||
| try { | ||
| this.collectorRegistry = new CollectorRegistry(); | ||
|
|
@@ -199,7 +201,12 @@ public synchronized RegionManager getRegionManager() { | |
| if (res == null) { | ||
| synchronized (this) { | ||
| if (regionManager == null) { | ||
| regionManager = | ||
| new RegionManager( | ||
| getPDClient(), | ||
| this.cacheInvalidateCallback, | ||
| this.channelFactory, | ||
| this.enableGrpcForward); | ||
| } | ||
| res = regionManager; | ||
| } | ||
|
|
@@ -415,10 +422,10 @@ private List<TiRegion> splitRegion(List<ByteString> splitKeys, BackOffer backOff | |
| groupKeysByRegion(regionManager, splitKeys, backOffer); | ||
| for (Map.Entry<TiRegion, List<ByteString>> entry : groupKeys.entrySet()) { | ||
|
|
||
| Pair<TiRegion, TiStore> pair = | ||
| getRegionManager().getRegionStorePairByKey(entry.getKey().getStartKey()); | ||
| TiRegion region = pair.first; | ||
| TiStore store = pair.second; | ||
| List<ByteString> splits = | ||
| entry | ||
| .getValue() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,9 +73,7 @@ public boolean handleRegionError(BackOffer backOffer, Errorpb.Error error) { | |
| // onNotLeader is only needed when updateLeader succeeds, thus switch | ||
| // to a new store address. | ||
| TiRegion newRegion = this.regionManager.updateLeader(recv.getRegion(), newStoreId); | ||
| retry = newRegion != null && recv.onNotLeader(newRegion); | ||
|
|
||
| backOffFuncType = BackOffFunction.BackOffFuncType.BoUpdateLeader; | ||
| } else { | ||
|
|
@@ -107,7 +105,6 @@ public boolean handleRegionError(BackOffer backOffer, Errorpb.Error error) { | |
|
|
||
| this.regionManager.invalidateRegion(recv.getRegion()); | ||
| this.regionManager.invalidateStore(storeId); | ||
| // assume this is a low probability error, do not retry, just re-split the request by | ||
| // throwing it out. | ||
| return false; | ||
|
|
@@ -169,7 +166,11 @@ public boolean handleRegionError(BackOffer backOffer, Errorpb.Error error) { | |
|
|
||
| @Override | ||
| public boolean handleRequestError(BackOffer backOffer, Exception e) { | ||
| if (recv.onStoreUnreachable()) { | ||
| return true; | ||
| } else { | ||
| regionManager.onRequestFail(recv.getRegion()); | ||
| } | ||
|
|
||
| backOffer.doBackOff( | ||
| BackOffFunction.BackOffFuncType.BoTiKVRPC, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,11 +27,11 @@ | |
| import org.tikv.common.region.RegionStoreClient; | ||
| import org.tikv.common.region.RegionStoreClient.RegionStoreClientBuilder; | ||
| import org.tikv.common.region.TiRegion; | ||
| import org.tikv.common.region.TiStore; | ||
| import org.tikv.common.util.BackOffer; | ||
| import org.tikv.common.util.ConcreteBackOffer; | ||
| import org.tikv.common.util.Pair; | ||
| import org.tikv.kvproto.Kvrpcpb; | ||
|
|
||
| public class ConcreteScanIterator extends ScanIterator { | ||
| private final long version; | ||
|
|
@@ -82,10 +82,10 @@ TiRegion loadCurrentRegionToCache() throws GrpcException { | |
|
|
||
| private ByteString resolveCurrentLock(Kvrpcpb.KvPair current) { | ||
| logger.warn(String.format("resolve current key error %s", current.getError().toString())); | ||
| Pair<TiRegion, TiStore> pair = | ||
| builder.getRegionManager().getRegionStorePairByKey(current.getKey()); | ||
| TiRegion region = pair.first; | ||
| TiStore store = pair.second; | ||
| BackOffer backOffer = ConcreteBackOffer.newGetBackOff(); | ||
| try (RegionStoreClient client = builder.build(region, store)) { | ||
| return client.get(backOffer, current.getKey(), version); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,12 +32,12 @@ | |
| import org.tikv.common.operation.SchemaInfer; | ||
| import org.tikv.common.region.RegionStoreClient; | ||
| import org.tikv.common.region.TiRegion; | ||
| import org.tikv.common.region.TiStore; | ||
| import org.tikv.common.region.TiStoreType; | ||
| import org.tikv.common.util.BackOffer; | ||
| import org.tikv.common.util.ConcreteBackOffer; | ||
| import org.tikv.common.util.RangeSplitter; | ||
| import org.tikv.kvproto.Coprocessor; | ||
|
|
||
| public abstract class DAGIterator<T> | ||
| extends org.tikv.common.operation.iterator.CoprocessorIterator<T> { | ||
|
|
@@ -204,7 +204,7 @@ private SelectResponse process(RangeSplitter.RegionTask regionTask) { | |
| } | ||
| List<Coprocessor.KeyRange> ranges = task.getRanges(); | ||
| TiRegion region = task.getRegion(); | ||
| TiStore store = task.getStore(); | ||
|
|
||
| try { | ||
| RegionStoreClient client = | ||
|
|
@@ -245,7 +245,7 @@ private SelectResponse process(RangeSplitter.RegionTask regionTask) { | |
| private Iterator<SelectResponse> processByStreaming(RangeSplitter.RegionTask regionTask) { | ||
| List<Coprocessor.KeyRange> ranges = regionTask.getRanges(); | ||
| TiRegion region = regionTask.getRegion(); | ||
| TiStore store = regionTask.getStore(); | ||
|
|
||
| RegionStoreClient client; | ||
| try { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why enable by default?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not?