Skip to content

[close #616] check store version while using API V2 #617

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
iosmanthus merged 3 commits into from
Jun 20, 2022
Merged

[close #616] check store version while using API V2 #617

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41e862c
check store version in TiSession ctor while using API v2
iosmanthus Jun 17, 2022
451f5af
fix unit test
iosmanthus Jun 17, 2022
e04c7ac
accept pingyu's suggestion
iosmanthus Jun 17, 2022
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 @@ -175,6 +175,10 @@ public TiSession(TiConfiguration conf) {
}

this.client = PDClient.createRaw(conf, keyCodec, channelFactory);
if (conf.getApiVersion().isV2() && !StoreVersion.minTiKVVersion(Version.API_V2, client)) {
throw new IllegalStateException("Store version should larger than " + Version.API_V2);
Comment thread
iosmanthus marked this conversation as resolved.
Outdated
}

this.enableGrpcForward = conf.getEnableGrpcForward();
if (this.enableGrpcForward) {
logger.info("enable grpc forward for high available");
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/tikv/common/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public class Version {
public static final String RESOLVE_LOCK_V4 = "4.0.0";

public static final String BATCH_WRITE = "3.0.14";

public static final String API_V2 = "6.1.0";
}
11 changes: 11 additions & 0 deletions src/test/java/org/tikv/common/ApiVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,15 @@ public void testAccessV1ClusterWithTtl() throws InterruptedException {
Assert.assertNotNull(e);
}
}

@Test
public void testAccessOldVersionClusterWithV2() {
Assume.assumeFalse(minTiKVVersion("6.1.0"));

try (RawKVClient client = createRawClient(ApiVersion.V2)) {
Assert.fail("Should not create V2 client while store version is less than 6.1.0");
} catch (Exception e) {
Assert.assertNotNull(e);
}
}
}