Xds fallback #11254

larry-safran · 2024-06-03T22:19:13Z

Implementation of https://github.com/grpc/proposal/blob/master/A71-xds-fallback.md in Java

YifeiZhuang

This is good overall. I finally start to understand the spirit of it.

xds/src/main/java/io/grpc/xds/SharedXdsClientPoolProvider.java

xds/src/main/java/io/grpc/xds/XdsServerWrapper.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/test/java/io/grpc/xds/XdsClientFallbackTest.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/client/XdsClient.java

xds/src/test/java/io/grpc/xds/XdsClientFallbackTest.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java

xds/src/main/java/io/grpc/xds/client/XdsClient.java

larry-safran · 2024-09-05T01:51:36Z

Fallback is ready for review again.

YifeiZhuang

Sending what I have, mostly minor, I haven't looked deep enough.

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

census/src/test/java/io/grpc/census/CensusModulesTest.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

ejona86

Sending what I have.

xds/src/main/java/io/grpc/xds/GrpcXdsTransportFactory.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/client/XdsClient.java

xds/src/main/java/io/grpc/xds/GrpcXdsTransportFactory.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/test/java/io/grpc/xds/GrpcBootstrapperImplTest.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/GrpcXdsTransportFactory.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

ejona86 · 2024-10-31T18:18:09Z

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

      if (ignoreResourceDeletionEnabled && type.isFullStateOfTheWorld() && data != null) {
        if (!resourceDeletionIgnored) {
          logger.log(XdsLogLevel.FORCE_WARNING,
              "xds server {0}: ignoring deletion for resource type {1} name {2}}",
-              serverInfo.target(), type, resource);
+              getTarget(), type, resource);


Instead of re-discovering what caused this, can we just pass ControlPlaneClient, ServerInfo, or target into onAbsent()? We have that information in the two places we call it.

Changed it to get target from activeCpc.

I don't see a reason to use activeCpc (to call getActiveCpc() at all). Why re-discover what cpc caused this? It seems easy to add the argument. Would it be a pain to update tests or something like that?

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

larry-safran

Things done in commit 003348b

xds/src/test/java/io/grpc/xds/GrpcBootstrapperImplTest.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

ejona86

Sending what I have.

xds/src/main/java/io/grpc/xds/client/BootstrapperImpl.java

xds/src/main/java/io/grpc/xds/client/XdsClient.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/test/java/io/grpc/xds/ControlPlaneRule.java

xds/src/main/java/io/grpc/xds/client/XdsClient.java

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java

ejona86 · 2024-11-06T00:22:03Z

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

+          // try to fallback to lower priority control plane client
+          if (checkForFallback
+              && doFallbackForAuthority(
+                  cpcThatClosed, serverInfo, subscriber.serverInfos, subscriber.authority)) {


The docs for doFallbackForAuthority() say server info should be for the active CPC. But here it is identical to cpcThatClosed.getServerInfo().

Since we are only trying to do fallback for authorities for which the closed cpc was the active cpc, they are the same. However, since they are the same, and this is the only place that this method is called, there is no reason to pass the serverInfo.

authoritiesForClosedCpc = getActiveAuthorities(cpcThatClosed) ... if (subscriber.hasResult() || !authoritiesForClosedCpc.contains(subscriber.authority)) { continue; }

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

ejona86

Sending what I have.

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/client/BootstrapperImpl.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java

xds/src/main/java/io/grpc/xds/client/XdsClient.java

xds/src/main/java/io/grpc/xds/client/XdsTransportFactory.java

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java

ejona86 · 2024-11-20T21:15:56Z

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

+      throw new IllegalArgumentException("No xds servers found for authority " + authority);
+    }
+
+    for (ServerInfo serverInfo : serverInfos) {


This loop can consider cpcs that aren't currently registered for the authority, but it won't add them to activatedCpClients. That can cause activatedCpClients to be corrupted, where cpcs should be registered for the authority but aren't.

It is the manageControlPlaneClient method that is responsible for calling addCpcToAuthority which will add the specified cpc and any missing higher priority ones. So, by the end of manageControlPlaneClient, activatedCpClients will have exactly the cpcs that it should.

…he authority.

larry-safran force-pushed the xds_fallback branch from 96cecb2 to 72d9ac9 Compare June 6, 2024 00:56

larry-safran requested a review from ejona86 June 12, 2024 23:17

ejona86 requested a review from YifeiZhuang June 17, 2024 20:49

larry-safran marked this pull request as ready for review June 17, 2024 20:49

YifeiZhuang reviewed Jul 3, 2024

View reviewed changes

larry-safran force-pushed the xds_fallback branch from 709026a to 0c1eef8 Compare August 14, 2024 00:04

larry-safran requested a review from YifeiZhuang August 17, 2024 00:35

larry-safran force-pushed the xds_fallback branch from af33b25 to d8f7094 Compare August 21, 2024 20:55

larry-safran mentioned this pull request Aug 22, 2024

Xds client split #11484

Merged

YifeiZhuang reviewed Aug 22, 2024

View reviewed changes

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java Outdated Show resolved Hide resolved

xds/src/main/java/io/grpc/xds/client/XdsClient.java Outdated Show resolved Hide resolved

larry-safran requested a review from YifeiZhuang August 28, 2024 23:05

YifeiZhuang reviewed Sep 11, 2024

View reviewed changes

ejona86 reviewed Oct 18, 2024

View reviewed changes

ejona86 reviewed Oct 31, 2024

View reviewed changes

This comment was marked as resolved.

Sign in to view

ejona86 reviewed Oct 31, 2024

View reviewed changes

larry-safran commented Oct 31, 2024

View reviewed changes

xds/src/test/java/io/grpc/xds/GrpcBootstrapperImplTest.java Outdated Show resolved Hide resolved

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java Outdated Show resolved Hide resolved

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java Outdated Show resolved Hide resolved

ejona86 reviewed Nov 6, 2024

View reviewed changes

ejona86 reviewed Nov 7, 2024

View reviewed changes

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java Outdated Show resolved Hide resolved

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java Outdated Show resolved Hide resolved

ejona86 reviewed Nov 7, 2024

View reviewed changes

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java Outdated Show resolved Hide resolved

larry-safran requested a review from ejona86 November 11, 2024 23:49

ejona86 reviewed Nov 13, 2024

View reviewed changes

ejona86 reviewed Nov 20, 2024

View reviewed changes

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java Outdated Show resolved Hide resolved

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java Outdated Show resolved Hide resolved

ejona86 reviewed Nov 20, 2024

View reviewed changes

larry-safran force-pushed the xds_fallback branch from 4938332 to f186005 Compare November 21, 2024 21:48

XDS client fallback

f304264

larry-safran force-pushed the xds_fallback branch from f186005 to f304264 Compare November 21, 2024 23:32

Pass ServerInfo into onAbsent rather than using the current one for t…

fb6b49e

…he authority.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Xds fallback #11254

Xds fallback #11254

larry-safran commented Jun 3, 2024

YifeiZhuang left a comment

larry-safran commented Sep 5, 2024

YifeiZhuang left a comment

ejona86 left a comment

This comment was marked as resolved.

ejona86 Oct 31, 2024

larry-safran Nov 1, 2024

ejona86 Nov 7, 2024 •

edited

Loading

larry-safran left a comment

ejona86 left a comment

ejona86 Nov 6, 2024

larry-safran Nov 6, 2024

ejona86 left a comment

ejona86 Nov 20, 2024

larry-safran Nov 21, 2024

Xds fallback #11254

Are you sure you want to change the base?

Xds fallback #11254

Conversation

larry-safran commented Jun 3, 2024

YifeiZhuang left a comment

Choose a reason for hiding this comment

larry-safran commented Sep 5, 2024

YifeiZhuang left a comment

Choose a reason for hiding this comment

ejona86 left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

ejona86 Oct 31, 2024

Choose a reason for hiding this comment

larry-safran Nov 1, 2024

Choose a reason for hiding this comment

ejona86 Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

larry-safran left a comment

Choose a reason for hiding this comment

ejona86 left a comment

Choose a reason for hiding this comment

ejona86 Nov 6, 2024

Choose a reason for hiding this comment

larry-safran Nov 6, 2024

Choose a reason for hiding this comment

ejona86 left a comment

Choose a reason for hiding this comment

ejona86 Nov 20, 2024

Choose a reason for hiding this comment

larry-safran Nov 21, 2024

Choose a reason for hiding this comment

ejona86 Nov 7, 2024 •

edited

Loading