From be4dc4c36d7a2a8a32fe3dd2d5c82f45c7710c7b Mon Sep 17 00:00:00 2001
From: Larry Safran <lsafran@google.com>
Date: Tue, 6 Jun 2023 00:03:11 +0000
Subject: [PATCH] Flip default for RLS on XDS being enabled to true. (#10248)
 (#10252)

---
 xds/src/main/java/io/grpc/xds/XdsResourceType.java       | 2 +-
 xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/xds/src/main/java/io/grpc/xds/XdsResourceType.java b/xds/src/main/java/io/grpc/xds/XdsResourceType.java
index 143d22368ee..86fbf3fd6b9 100644
--- a/xds/src/main/java/io/grpc/xds/XdsResourceType.java
+++ b/xds/src/main/java/io/grpc/xds/XdsResourceType.java
@@ -47,7 +47,7 @@ abstract class XdsResourceType<T extends ResourceUpdate> {
   @VisibleForTesting
   static final String HASH_POLICY_FILTER_STATE_KEY = "io.grpc.channel_id";
   @VisibleForTesting
-  static boolean enableRouteLookup = getFlag("GRPC_EXPERIMENTAL_XDS_RLS_LB", false);
+  static boolean enableRouteLookup = getFlag("GRPC_EXPERIMENTAL_XDS_RLS_LB", true);
   @VisibleForTesting
   static boolean enableLeastRequest =
       !Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_ENABLE_LEAST_REQUEST"))
diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java
index f26f1eba879..b73240490c5 100644
--- a/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java
@@ -172,7 +172,6 @@ public class XdsClientImplDataTest {
   @Before
   public void setUp() {
     originalEnableRouteLookup = XdsResourceType.enableRouteLookup;
-    assertThat(originalEnableRouteLookup).isFalse();
     originalEnableLeastRequest = XdsResourceType.enableLeastRequest;
     assertThat(originalEnableLeastRequest).isFalse();
     originalEnableWrr = XdsResourceType.enableWrr;