grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grpclb,xds: fix parseLoadBalancingConfigPolicy error message format

This commit is contained in:
ZHANG Dapeng 2020-01-28 13:08:05 -08:00 committed by GitHub
parent 589a645a38
commit 64e827d996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancerProvider.java
View File

@ -70,7 +70,8 @@ public final class GrpclbLoadBalancerProvider extends LoadBalancerProvider {
return parseLoadBalancingConfigPolicyInternal(rawLoadBalancingConfigPolicy); return parseLoadBalancingConfigPolicyInternal(rawLoadBalancingConfigPolicy);
} catch (RuntimeException e) { } catch (RuntimeException e) {
return ConfigOrError.fromError( return ConfigOrError.fromError(
Status.INTERNAL.withDescription("can't parse config: " + e.getMessage()).withCause(e)); Status.fromThrowable(e).withDescription(
"Failed to parse GRPCLB config: " + rawLoadBalancingConfigPolicy));
} }
} }

3
xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java
View File

@ -76,7 +76,8 @@ public class CdsLoadBalancerProvider extends LoadBalancerProvider {
return ConfigOrError.fromConfig(new CdsConfig(cluster)); return ConfigOrError.fromConfig(new CdsConfig(cluster));
} catch (RuntimeException e) { } catch (RuntimeException e) {
return ConfigOrError.fromError( 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));
} }
} }

3
xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java
View File

@ -86,7 +86,8 @@ public final class XdsLoadBalancerProvider extends LoadBalancerProvider {
new XdsConfig(childPolicy, fallbackPolicy, edsServiceName, lrsServerName)); new XdsConfig(childPolicy, fallbackPolicy, edsServiceName, lrsServerName));
} catch (RuntimeException e) { } catch (RuntimeException e) {
return ConfigOrError.fromError( 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));
} }
} }