[pick_first] de-experiment pick first

mohanli-ml · Aug 16, 2023 · 2a88a7e · 2a88a7e
1 parent 9574b2a
commit 2a88a7e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 19 deletions.
diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
@@ -82,9 +82,6 @@ class PickFirstConfig : public LoadBalancingPolicy::Config {
     return kJsonLoader;
   }
 
-  void JsonPostLoad(const Json& /* json */, const JsonArgs& /* args */,
-                    ValidationErrors* /* errors */) {}
-
  private:
   bool shuffle_addresses_ = false;
 };

diff --git a/src/core/lib/json/json_object_loader.h b/src/core/lib/json/json_object_loader.h
@@ -537,13 +537,7 @@ class FinishedJsonObjectLoader<T, kElemCount,
       : elements_(elements) {}
 
   void LoadInto(const Json& json, const JsonArgs& args, void* dst,
-                ValidationErrors* errors) const override {
-    // Call JsonPostLoad() only if json is a JSON object.
-    if (LoadObject(json, args, elements_.data(), elements_.size(), dst,
-                   errors)) {
-      static_cast<T*>(dst)->JsonPostLoad(json, args, errors);
-    }
-  }
+                ValidationErrors* errors) const override {}
 
  private:
   GPR_NO_UNIQUE_ADDRESS Vec<Element, kElemCount> elements_;

diff --git a/test/core/client_channel/lb_policy/pick_first_test.cc b/test/core/client_channel/lb_policy/pick_first_test.cc
@@ -486,8 +486,6 @@ TEST_F(PickFirstTest, GoesIdleWhenConnectionFailsThenCanReconnect) {
 }
 
 TEST_F(PickFirstTest, WithShuffle) {
-  testing::ScopedExperimentalEnvVar env_var(
-      "GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG");
   constexpr std::array<absl::string_view, 6> kAddresses = {
       "ipv4:127.0.0.1:443", "ipv4:127.0.0.1:444", "ipv4:127.0.0.1:445",
       "ipv4:127.0.0.1:446", "ipv4:127.0.0.1:447", "ipv4:127.0.0.1:448"};
@@ -516,8 +514,6 @@ TEST_F(PickFirstTest, WithShuffle) {
 }
 
 TEST_F(PickFirstTest, ShufflingDisabled) {
-  testing::ScopedExperimentalEnvVar env_var(
-      "GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG");
   constexpr std::array<absl::string_view, 6> kAddresses = {
       "ipv4:127.0.0.1:443", "ipv4:127.0.0.1:444", "ipv4:127.0.0.1:445",
       "ipv4:127.0.0.1:446", "ipv4:127.0.0.1:447", "ipv4:127.0.0.1:448"};

diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc
@@ -450,7 +450,6 @@ TEST(WrrLocality, UnsupportedChildPolicyTypeSkipped) {
 //
 
 TEST(PickFirst, NoShuffle) {
-  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG");
   LoadBalancingPolicyProto policy;
   auto* lb_policy = policy.add_policies();
   PickFirst pick_first;
@@ -463,7 +462,6 @@ TEST(PickFirst, NoShuffle) {
 }
 
 TEST(PickFirst, Shuffle) {
-  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG");
   LoadBalancingPolicyProto policy;
   auto* lb_policy = policy.add_policies();
   PickFirst pick_first;
@@ -476,7 +474,6 @@ TEST(PickFirst, Shuffle) {
 }
 
 TEST(PickFirst, ShuffleOmitted) {
-  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG");
   LoadBalancingPolicyProto policy;
   auto* lb_policy = policy.add_policies();
   lb_policy->mutable_typed_extension_config()->mutable_typed_config()->PackFrom(

diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
@@ -80,8 +80,6 @@ INSTANTIATE_TEST_SUITE_P(XdsTest, PickFirstTest,
                          ::testing::Values(XdsTestType()), &XdsTestType::Name);
 
 TEST_P(PickFirstTest, PickFirstConfigurationIsPropagated) {
-  grpc_core::testing::ScopedExperimentalEnvVar env_var(
-      "GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG");
   CreateAndStartBackends(6);
   // Change cluster to use pick_first with shuffle option.
   auto cluster = default_cluster_;