From 64e827d9961edab2619c1cf25f51d3a46143efbe Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Tue, 28 Jan 2020 13:08:05 -0800 Subject: [PATCH] grpclb,xds: fix parseLoadBalancingConfigPolicy error message format --- .../main/java/io/grpc/grpclb/GrpclbLoadBalancerProvider.java | 3 ++- xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java | 3 ++- xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancerProvider.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancerProvider.java index c70197ab6d..eb748d3e1d 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancerProvider.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancerProvider.java @@ -70,7 +70,8 @@ public final class GrpclbLoadBalancerProvider extends LoadBalancerProvider { return parseLoadBalancingConfigPolicyInternal(rawLoadBalancingConfigPolicy); } catch (RuntimeException e) { return ConfigOrError.fromError( - Status.INTERNAL.withDescription("can't parse config: " + e.getMessage()).withCause(e)); + Status.fromThrowable(e).withDescription( + "Failed to parse GRPCLB config: " + rawLoadBalancingConfigPolicy)); } } diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java index eb1abb1be7..1950168ba9 100644 --- a/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java +++ b/xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java @@ -76,7 +76,8 @@ public class CdsLoadBalancerProvider extends LoadBalancerProvider { return ConfigOrError.fromConfig(new CdsConfig(cluster)); } catch (RuntimeException e) { return ConfigOrError.fromError( - Status.UNKNOWN.withDescription("Failed to parse config " + e.getMessage()).withCause(e)); + Status.fromThrowable(e).withDescription( + "Failed to parse CDS LB config: " + rawLoadBalancingPolicyConfig)); } } diff --git a/xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java index 2663883e66..82311647e3 100644 --- a/xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java +++ b/xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java @@ -86,7 +86,8 @@ public final class XdsLoadBalancerProvider extends LoadBalancerProvider { new XdsConfig(childPolicy, fallbackPolicy, edsServiceName, lrsServerName)); } catch (RuntimeException e) { return ConfigOrError.fromError( - Status.UNKNOWN.withDescription("Failed to parse config " + e.getMessage()).withCause(e)); + Status.fromThrowable(e).withDescription( + "Failed to parse XDS LB config: " + rawLoadBalancingPolicyConfig)); } }