xds: gate xDS timeout with env variable (#7504)

grpc · Oct 12, 2020 · 46290ef · 46290ef
1 parent f9b428a
commit 46290ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
@@ -71,6 +71,9 @@ final class XdsNameResolver extends NameResolver {
 
   static final CallOptions.Key<String> CLUSTER_SELECTION_KEY =
       CallOptions.Key.create("io.grpc.xds.CLUSTER_SELECTION_KEY");
+  @VisibleForTesting
+  static boolean enableTimeout =
+      Boolean.parseBoolean(System.getenv("GRPC_XDS_EXPERIMENTAL_ENABLE_TIMEOUT"));
 
   private final XdsLogger logger;
   private final String authority;
@@ -354,9 +357,11 @@ public Result selectConfig(PickSubchannelArgs args) {
         }
       } while (!retainCluster(cluster));
       // TODO(chengyuanzhang): avoid service config generation and parsing for each call.
-      Map<String, ?> rawServiceConfig =
-          generateServiceConfigWithMethodTimeoutConfig(
-              selectedRoute.getRouteAction().getTimeoutNano());
+      Map<String, ?> rawServiceConfig = Collections.emptyMap();
+      if (enableTimeout) {
+        rawServiceConfig = generateServiceConfigWithMethodTimeoutConfig(
+            selectedRoute.getRouteAction().getTimeoutNano());
+      }
       ConfigOrError parsedServiceConfig = serviceConfigParser.parseServiceConfig(rawServiceConfig);
       Object config = parsedServiceConfig.getConfig();
       if (config == null) {

diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
@@ -119,6 +119,7 @@ XdsChannel createChannel(List<ServerInfo> servers) throws XdsInitializationExcep
 
   @Before
   public void setUp() {
+    XdsNameResolver.enableTimeout = true;
     Bootstrapper bootstrapper = new Bootstrapper() {
       @Override
       public BootstrapInfo readBootstrap() {