Skip to content
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

Jump to bottom

fix: Set up DirectPath e2e tests correctly #780

Merged
merged 6 commits into from Jan 7, 2021
Merged

fix: Set up DirectPath e2e tests correctly #780

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d549ed
chore: add DirectPath fallback integration test
mohanli-ml Nov 30, 2020
7a35667
Merge branch 'dp-branch'
mohanli-ml Dec 3, 2020
9851996
Merge remote-tracking branch 'upstream/master'
mohanli-ml Dec 15, 2020
bddf755
Merge remote-tracking branch 'upstream/master'
mohanli-ml Jan 5, 2021
35ffe0c
Merge remote-tracking branch 'upstream/master'
mohanli-ml Jan 7, 2021
b750278
fix: Set up DirectPath e2e tests correctly
mohanli-ml Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
View file
Open in desktop
Expand Up @@ -70,12 +70,6 @@ public GceTestEnvConfig() {
SpannerOptions.newBuilder()
.setAutoThrottleAdministrativeRequests()
.setTrackTransactionStarter();
InstantiatingGrpcChannelProvider.Builder defaultChannelProviderBuilder =
InstantiatingGrpcChannelProvider.newBuilder();
if (attemptDirectPath) {
builder.setChannelProvider(
defaultChannelProviderBuilder.setEndpoint(DIRECT_PATH_ENDPOINT).build());
}
if (!projectId.isEmpty()) {
builder.setProjectId(projectId);
}
Expand All @@ -96,6 +90,16 @@ public GceTestEnvConfig() {
interceptorProvider.with(new DirectPathAddressCheckInterceptor(directPathTestScenario));
}
builder.setInterceptorProvider(interceptorProvider);
// DirectPath tests need to set a custom endpoint to the ChannelProvider
InstantiatingGrpcChannelProvider.Builder customChannelProviderBuilder =
InstantiatingGrpcChannelProvider.newBuilder();
if (attemptDirectPath) {
customChannelProviderBuilder
.setEndpoint(DIRECT_PATH_ENDPOINT)
.setAttemptDirectPath(true)
.setInterceptorProvider(interceptorProvider);
builder.setChannelProvider(customChannelProviderBuilder.build());
}
options = builder.build();
}

Expand Down