tikv
/
client-java
mirror of https://github.com/tikv/client-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[close #550] rawkv: fix seek leader/proxy store early abort (#551) 

Co-authored-by: ti-srebot <66930949+ti-srebot@users.noreply.github.com>
This commit is contained in:
iosmanthus 2022-03-23 12:48:48 +08:00 committed by GitHub
parent b5b0545b6f
commit e89ca5f37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 100 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/tikv/common/region/AbstractRegionStoreClient.java
View File

@ -277,6 +277,7 @@ public abstract class AbstractRegionStoreClient
List<SwitchLeaderTask> responses = new LinkedList<>();
for (Metapb.Peer peer : region.getFollowerList()) {
ByteString key = region.getStartKey();
try {
TiStore peerStore = regionManager.getStoreById(peer.getStoreId(), backOffer);
ManagedChannel channel =
channelFactory.getChannel(
@ -290,6 +291,13 @@ public abstract class AbstractRegionStoreClient
.build();
ListenableFuture<Kvrpcpb.RawGetResponse> task = stub.rawGet(rawGetRequest);
responses.add(new SwitchLeaderTask(task, peer));
} catch (Exception e) {
logger.warn(
"switch region[{}] leader store to {} failed: {}",
region.getId(),
peer.getStoreId(),
e);
}
}
while (true) {
try {
@ -328,12 +336,14 @@ public abstract class AbstractRegionStoreClient
List<ForwardCheckTask> responses = new LinkedList<>();
for (Metapb.Peer peer : region.getFollowerList()) {
ByteString key = region.getStartKey();
try {
TiStore peerStore = regionManager.getStoreById(peer.getStoreId(), backOffer);
ManagedChannel channel =
channelFactory.getChannel(
peerStore.getAddress(), regionManager.getPDClient().getHostMapping());
TikvGrpc.TikvFutureStub stub =
TikvGrpc.newFutureStub(channel).withDeadlineAfter(forwardTimeout, TimeUnit.MILLISECONDS);
TikvGrpc.newFutureStub(channel)
.withDeadlineAfter(forwardTimeout, TimeUnit.MILLISECONDS);
Metadata header = new Metadata();
header.put(TiConfiguration.FORWARD_META_DATA_KEY, store.getStore().getAddress());
Kvrpcpb.RawGetRequest rawGetRequest =
@ -344,6 +354,13 @@ public abstract class AbstractRegionStoreClient
ListenableFuture<Kvrpcpb.RawGetResponse> task =
MetadataUtils.attachHeaders(stub, header).rawGet(rawGetRequest);
responses.add(new ForwardCheckTask(task, peerStore.getStore()));
} catch (Exception e) {
logger.warn(
"switch region[{}] leader store to {} failed: {}",
region.getId(),
peer.getStoreId(),
e);
}
}
while (true) {
try {

27
src/main/java/org/tikv/common/region/RegionManager.java
View File

@ -26,7 +26,6 @@ import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tikv.common.ReadOnlyPDClient;
@ -47,6 +46,7 @@ import org.tikv.kvproto.Pdpb;
@SuppressWarnings("UnstableApiUsage")
public class RegionManager {
private static final Logger logger = LoggerFactory.getLogger(RegionManager.class);
public static final Histogram GET_REGION_BY_KEY_REQUEST_LATENCY =
HistogramUtils.buildDuration()
@ -205,22 +205,23 @@ public class RegionManager {
}
public TiRegion createRegion(Metapb.Region region, BackOffer backOffer) {
List<Metapb.Peer> peers = region.getPeersList();
List<TiStore> stores = getRegionStore(peers, backOffer);
return new TiRegion(conf, region, null, peers, stores);
return createRegion(region, null, backOffer);
}
private TiRegion createRegion(Metapb.Region region, Metapb.Peer leader, BackOffer backOffer) {
List<Metapb.Peer> peers = region.getPeersList();
List<TiStore> stores = getRegionStore(peers, backOffer);
return new TiRegion(conf, region, leader, peers, stores);
List<Metapb.Peer> peers = new ArrayList<>();
List<TiStore> stores = new ArrayList<>();
for (Metapb.Peer peer : region.getPeersList()) {
try {
stores.add(getStoreById(peer.getStoreId(), backOffer));
peers.add(peer);
} catch (Exception e) {
logger.warn("Store {} not found: {}", peer.getStoreId(), e.toString());
}
private List<TiStore> getRegionStore(List<Metapb.Peer> peers, BackOffer backOffer) {
return peers
.stream()
.map(p -> getStoreById(p.getStoreId(), backOffer))
.collect(Collectors.toList());
}
Metapb.Region newRegion =
Metapb.Region.newBuilder().mergeFrom(region).clearPeers().addAllPeers(peers).build();
return new TiRegion(conf, newRegion, leader, peers, stores);
}
private TiStore getStoreByIdWithBackOff(long id, BackOffer backOffer) {

2
src/test/java/org/tikv/common/PDClientMockTest.java
View File

@ -41,7 +41,7 @@ import org.tikv.kvproto.Metapb.StoreState;
public class PDClientMockTest extends PDMockServerTest {
private static final String LOCAL_ADDR_IPV6 = "[::]";
private static final String LOCAL_ADDR_IPV6 = "[::1]";
public static final String HTTP = "http://";
@Test

6
src/test/java/org/tikv/common/PDMockServerTest.java
View File

@ -39,7 +39,7 @@ public abstract class PDMockServerTest {
void setup(String addr) throws IOException {
int basePort;
try (ServerSocket s = new ServerSocket(51820)) {
try (ServerSocket s = new ServerSocket(0)) {
basePort = s.getLocalPort();
}
@ -54,9 +54,11 @@ public abstract class PDMockServerTest {
GrpcUtils.makeMember(2, "http://" + addr + ":" + (basePort + 1)),
GrpcUtils.makeMember(3, "http://" + addr + ":" + (basePort + 2))));
pdServers.add(server);
if (i == 0) {
leader = server;
}
}
leader = pdServers.get(0);
TiConfiguration conf = TiConfiguration.createDefault(addr + ":" + leader.port);
conf.setKvMode("RAW");
conf.setWarmUpEnable(false);

35
src/test/java/org/tikv/common/SeekLeaderStoreTest.java
View File

@ -18,9 +18,13 @@
package org.tikv.common;
import com.google.protobuf.ByteString;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Assert;
import org.junit.Test;
import org.tikv.common.KVMockServer.State;
import org.tikv.kvproto.Metapb;
import org.tikv.kvproto.Metapb.StoreState;
import org.tikv.kvproto.Pdpb;
import org.tikv.raw.RawKVClient;
public class SeekLeaderStoreTest extends MockThreeStoresTest {
@ -34,12 +38,41 @@ public class SeekLeaderStoreTest extends MockThreeStoresTest {
RawKVClient client = createClient();
ByteString key = ByteString.copyFromUtf8("key");
ByteString value = ByteString.copyFromUtf8("value");
put(key, value);
client.put(key, value);
Assert.assertEquals(value, client.get(key).get());
servers.get(0).setState(State.Fail);
servers.get(1).setRegion(region.switchPeer(stores.get(1).getId()));
Assert.assertEquals(value, client.get(key).get());
remove(key, value);
}
@Test
public void testSeekLeaderMeetInvalidStore() {
RawKVClient client = createClient();
ByteString key = ByteString.copyFromUtf8("key");
ByteString value = ByteString.copyFromUtf8("value");
put(key, value);
servers.get(0).setState(State.Fail);
servers.get(2).setRegion(region.switchPeer(stores.get(2).getId()));
AtomicInteger i = new AtomicInteger(0);
leader.addGetStoreListener(
request -> {
Metapb.Store.Builder storeBuilder =
Metapb.Store.newBuilder().mergeFrom(stores.get((int) request.getStoreId() - 1));
if (request.getStoreId() == 0x2 && i.incrementAndGet() > 0) {
storeBuilder.setState(StoreState.Tombstone);
}
return Pdpb.GetStoreResponse.newBuilder().setStore(storeBuilder.build()).build();
});
Assert.assertEquals(value, client.get(key).get());
remove(key, value);
}
}