Skip to content

Commit 11e19fb

Browse files
committed
Enable LRS in local tests and fix LRS config generation bugs
1 parent 8f9bd7a commit 11e19fb

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

packages/grpc-js-xds/src/load-balancer-lrs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class LrsLoadBalancingConfig implements TypedLoadBalancingConfig {
9797
if (!('child_policy' in obj && Array.isArray(obj.child_policy))) {
9898
throw new Error('lrs config must have a child_policy array');
9999
}
100-
const childConfig = selectLbConfigFromList(obj.config);
100+
const childConfig = selectLbConfigFromList(obj.child_policy);
101101
if (!childConfig) {
102102
throw new Error('lrs config child_policy parsing failed');
103103
}

packages/grpc-js-xds/src/load-balancer-xds-cluster-resolver.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@ export class XdsClusterResolver implements LoadBalancer {
310310
cluster_name: entry.discoveryMechanism.cluster,
311311
eds_service_name: entry.discoveryMechanism.eds_service_name ?? '',
312312
locality: {...localityObj.locality},
313-
lrs_load_reporting_server: {...entry.discoveryMechanism.lrs_load_reporting_server}
313+
lrs_load_reporting_server: {...entry.discoveryMechanism.lrs_load_reporting_server},
314+
child_policy: endpointPickingPolicy
314315
}
315316
}];
316317
} else {

packages/grpc-js-xds/test/framework.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ export class FakeEdsCluster implements FakeCluster {
8383
name: this.clusterName,
8484
type: 'EDS',
8585
eds_cluster_config: {eds_config: {ads: {}}, service_name: this.endpointName},
86-
lb_policy: 'ROUND_ROBIN'
86+
lb_policy: 'ROUND_ROBIN',
87+
lrs_server: {self: {}}
8788
}
8889
}
8990

0 commit comments

Comments
 (0)