Skip to content

Commit

Permalink
Fix handling of LRS server name in EDS child config generation
Browse files Browse the repository at this point in the history
Also add more LRS logging
  • Loading branch information
murgatroid99 committed Mar 5, 2021
1 parent b85c708 commit e3b3550
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion packages/grpc-js-xds/src/load-balancer-lrs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/

import { connectivityState as ConnectivityState, StatusObject, status as Status, experimental } from '@grpc/grpc-js';
import { type } from 'os';
import { Locality__Output } from './generated/envoy/api/v2/core/Locality';
import { XdsClusterLocalityStats, XdsClient } from './xds-client';
import LoadBalancer = experimental.LoadBalancer;
Expand Down
2 changes: 2 additions & 0 deletions packages/grpc-js-xds/src/xds-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@ export class XdsClient {
clusterName: string,
edsServiceName: string
): XdsClusterDropStats {
trace('addClusterDropStats(lrsServer=' + lrsServer + ', clusterName=' + clusterName + ', edsServiceName=' + edsServiceName + ')');
if (lrsServer !== '') {
return {
addCallDropped: (category) => {},
Expand All @@ -1197,6 +1198,7 @@ export class XdsClient {
edsServiceName: string,
locality: Locality__Output
): XdsClusterLocalityStats {
trace('addClusterLocalityStats(lrsServer=' + lrsServer + ', clusterName=' + clusterName + ', edsServiceName=' + edsServiceName + ', locality=' + JSON.stringify(locality) + ')');
if (lrsServer !== '') {
return {
addCallStarted: () => {},
Expand Down

0 comments on commit e3b3550

Please sign in to comment.