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

c2p resolver: use federation if enabled via env var #9660

Merged
merged 5 commits into from Oct 28, 2022
Merged

c2p resolver: use federation if enabled via env var #9660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c12662
c2p resolver: if federation is enabled then use xdstp LDS names and d…
apolcyn Oct 26, 2022
35f163d
update
apolcyn Oct 26, 2022
d74ae85
fix style
apolcyn Oct 26, 2022
f2979a5
update unit test
apolcyn Oct 27, 2022
b8dd882
Fix test
apolcyn Oct 27, 2022
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
29 changes: 26 additions & 3 deletions googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.CharStreams;
Expand Down Expand Up @@ -54,6 +55,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
@VisibleForTesting
static final String METADATA_URL_SUPPORT_IPV6 =
"http://metadata.google.internal/computeMetadata/v1/instance/network-interfaces/0/ipv6s";
static final String C2P_AUTHORITY = "traffic-director-c2p.xds.googleapis.com";
@VisibleForTesting
static boolean isOnGcp = InternalCheckGcpEnvironment.isOnGcp();
@VisibleForTesting
Expand All @@ -62,6 +64,10 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
|| System.getProperty("io.grpc.xds.bootstrap") != null
|| System.getenv("GRPC_XDS_BOOTSTRAP_CONFIG") != null
|| System.getProperty("io.grpc.xds.bootstrapConfig") != null;
@VisibleForTesting
static boolean enableFederation =
!Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION"))
&& Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION"));

private static final String serverUriOverride =
System.getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI");
Expand All @@ -76,7 +82,10 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
private final boolean usingExecutorResource;
// It's not possible to use both PSM and DirectPath C2P in the same application.
// Delegate to DNS if user-provided bootstrap is found.
private final String schemeOverride = !isOnGcp || xdsBootstrapProvided ? "dns" : "xds";
private final String schemeOverride =
!isOnGcp
|| (xdsBootstrapProvided && !enableFederation)
? "dns" : "xds";
private Executor executor;
private Listener2 listener;
private boolean succeeded;
Expand All @@ -103,8 +112,12 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
targetUri);
authority = GrpcUtil.checkAuthority(targetPath.substring(1));
syncContext = checkNotNull(args, "args").getSynchronizationContext();
targetUri = overrideUriScheme(targetUri, schemeOverride);
if (schemeOverride.equals("xds") && enableFederation) {
targetUri = overrideUriAuthority(targetUri, C2P_AUTHORITY);
}
delegate = checkNotNull(nameResolverFactory, "nameResolverFactory").newNameResolver(
overrideUriScheme(targetUri, schemeOverride), args);
targetUri, args);
executor = args.getOffloadExecutor();
usingExecutorResource = executor == null;
}
Expand Down Expand Up @@ -193,7 +206,7 @@ public void run() {
serverBuilder.put("server_features", ImmutableList.of("xds_v3"));
ImmutableMap.Builder<String, Object> authoritiesBuilder = ImmutableMap.builder();
authoritiesBuilder.put(
"traffic-director-c2p.xds.googleapis.com",
C2P_AUTHORITY,
ImmutableMap.of("xds_servers", ImmutableList.of(serverBuilder.buildOrThrow())));
return ImmutableMap.of(
"node", nodeBuilder.buildOrThrow(),
Expand Down Expand Up @@ -271,6 +284,16 @@ private static URI overrideUriScheme(URI uri, String scheme) {
return res;
}

private static URI overrideUriAuthority(URI uri, String authority) {
URI res;
try {
res = new URI(uri.getScheme(), authority, uri.getPath(), uri.getQuery(), uri.getFragment());
} catch (URISyntaxException ex) {
throw new IllegalArgumentException("Invalid authority: " + authority, ex);
}
return res;
}

private enum HttpConnectionFactory implements HttpConnectionProvider {
INSTANCE;

Expand Down
36 changes: 35 additions & 1 deletion googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@ public class GoogleCloudToProdNameResolverTest {
@Rule
public final MockitoRule mocks = MockitoJUnit.rule();

private static final URI TARGET_URI = URI.create("google-c2p-experimental:///googleapis.com");
private static final URI TARGET_URI = URI.create("google-c2p:///googleapis.com");
private static final String ZONE = "us-central1-a";
private static final int DEFAULT_PORT = 887;

Expand Down Expand Up @@ -187,6 +187,40 @@ public void onGcpAndNoProvidedBootstrapDelegateToXds() {
"server_uri", "directpath-pa.googleapis.com",
"channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")),
"server_features", ImmutableList.of("xds_v3"));
Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
assertThat(authorities).containsExactly(
"traffic-director-c2p.xds.googleapis.com",
ImmutableMap.of("xds_servers", ImmutableList.of(server)));
}

@SuppressWarnings("unchecked")
@Test
public void onGcpAndProvidedBootstrapAndFederationEnabledDelegateToXds() {
GoogleCloudToProdNameResolver.isOnGcp = true;
GoogleCloudToProdNameResolver.xdsBootstrapProvided = true;
GoogleCloudToProdNameResolver.enableFederation = true;
createResolver();
resolver.start(mockListener);
fakeExecutor.runDueTasks();
assertThat(delegatedResolver.keySet()).containsExactly("xds");
verify(Iterables.getOnlyElement(delegatedResolver.values())).start(mockListener);
// check bootstrap
Map<String, ?> bootstrap = fakeBootstrapSetter.bootstrapRef.get();
Map<String, ?> node = (Map<String, ?>) bootstrap.get("node");
assertThat(node).containsExactly(
"id", "C2P-991614323",
"locality", ImmutableMap.of("zone", ZONE),
"metadata", ImmutableMap.of("TRAFFICDIRECTOR_DIRECTPATH_C2P_IPV6_CAPABLE", true));
Map<String, ?> server = Iterables.getOnlyElement(
(List<Map<String, ?>>) bootstrap.get("xds_servers"));
assertThat(server).containsExactly(
"server_uri", "directpath-pa.googleapis.com",
"channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")),
"server_features", ImmutableList.of("xds_v3"));
Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
assertThat(authorities).containsExactly(
"traffic-director-c2p.xds.googleapis.com",
ImmutableMap.of("xds_servers", ImmutableList.of(server)));
}

@Test
Expand Down