Fail the whole conversion process on the first conversion failure.

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

@@ -171,17 +171,12 @@ static class LoadBalancingPolicyConverter {
           }
           // TODO: support least_request once it is added to the envoy protos.
         } catch (InvalidProtocolBufferException e) {
-          logger.log(XdsLogLevel.WARNING, "Invalid Any protobuf for policy {0}: {1}",
-              typedConfig.getTypeUrl(), e.getMessage());
-          continue;
-        } catch (ResourceInvalidException e) {
-          logger.log(XdsLogLevel.WARNING, "Invalid configuration for policy {0}: {1}",
-              typedConfig.getTypeUrl(), e.getMessage());
-          continue;
+          throw new ResourceInvalidException(
+              "Unable to unpack typedConfig for: " + typedConfig.getTypeUrl(), e);
         }
         // The service config is expected to have a single root entry, where the name of that entry
         // is the name of the policy. A Load balancer with this name must exist in the registry.
-        if (serviceConfig != null && LoadBalancerRegistry.getDefaultRegistry()
+        if (serviceConfig == null || LoadBalancerRegistry.getDefaultRegistry()
             .getProvider(Iterables.getOnlyElement(serviceConfig.keySet())) == null) {
           logger.log(XdsLogLevel.WARNING, "Policy {0} not found in the LB registry, skipping",
               typedConfig.getTypeUrl());

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

@@ -177,7 +177,7 @@ public void ringHash_invalidHash() {
       // With the new config mechanism we get a more generic error than with the old one because the
       // logic loops over potentially multiple configurations and only throws an exception at the
       // end if there was no valid policies found.
-      assertThat(e).hasMessageThat().contains("Invalid LoadBalancingPolicy");
+      assertThat(e).hasMessageThat().contains("Invalid ring hash function");
       return;
     }
     fail("ResourceInvalidException not thrown");
@@ -266,7 +266,9 @@ public void complexCustomConfig_customProviderRegistered() throws ResourceInvali
         LoadBalancerConfigFactory.newConfig(cluster, false)));
   }
 
-  // When a provider for the custom policy is NOT available, we fall back to the next available one.
+  // When a provider for the custom policy is NOT available, we still fail even if there is another
+  // round_robin configuration in the list as the wrr_locality the custom config is wrapped in is
+  // a recognized type and expected to have a valid config.
   @Test
   public void complexCustomConfig_customProviderNotRegistered() throws ResourceInvalidException {
     Cluster cluster = Cluster.newBuilder()
@@ -275,8 +277,14 @@ public void complexCustomConfig_customProviderNotRegistered() throws ResourceInv
                 .addPolicies(buildWrrPolicy(ROUND_ROBIN_POLICY)))
         .build();
 
-    assertValidRoundRobin(ServiceConfigUtil.unwrapLoadBalancingConfig(
-        LoadBalancerConfigFactory.newConfig(cluster, false)));
+    try {
+      ServiceConfigUtil.unwrapLoadBalancingConfig(
+          LoadBalancerConfigFactory.newConfig(cluster, false));
+    } catch (ResourceInvalidException e) {
+      assertThat(e).hasMessageThat().contains("Invalid LoadBalancingPolicy");
+      return;
+    }
+    fail("ResourceInvalidException not thrown");
   }
 
   private void assertValidCustomConfig(LbConfig lbConfig) {