Merge pull request #1979 from murgatroid99/grpc-js_1.4_upmerge

Upmerge 1.4.x into master

Author: murgatroid99

packages/grpc-js-xds/src/xds-stream-state/cds-state.ts

@@ -164,22 +164,16 @@ export class CdsState implements XdsStreamState<Cluster__Output> {
     }
     this.latestResponses = validResponses;
     this.latestIsV2 = isV2;
-    const allEdsServiceNames: Set<string> = new Set<string>();
     const allClusterNames: Set<string> = new Set<string>();
     for (const message of validResponses) {
       allClusterNames.add(message.name);
-      const edsServiceName = message.eds_cluster_config?.service_name ?? '';
-      allEdsServiceNames.add(
-        edsServiceName === '' ? message.name : edsServiceName
-      );
       const watchers = this.watchers.get(message.name) ?? [];
       for (const watcher of watchers) {
         watcher.onValidUpdate(message, isV2);
       }
     }
     trace('Received CDS updates for cluster names [' + Array.from(allClusterNames) + ']');
     result.missing = this.handleMissingNames(allClusterNames);
-    this.edsState.handleMissingNames(allEdsServiceNames);
     return result;
   }
 

packages/grpc-js-xds/src/xds-stream-state/eds-state.ts

@@ -129,23 +129,6 @@ export class EdsState implements XdsStreamState<ClusterLoadAssignment__Output> {
     return true;
   }
 
-  /**
-   * Given a list of edsServiceNames (which may actually be the cluster name),
-   * for each watcher watching a name not on the list, call that watcher's
-   * onResourceDoesNotExist method.
-   * @param allClusterNames
-   */
-  handleMissingNames(allEdsServiceNames: Set<string>) {
-    for (const [edsServiceName, watcherList] of this.watchers.entries()) {
-      if (!allEdsServiceNames.has(edsServiceName)) {
-        trace('Reporting EDS resource does not exist for edsServiceName ' + edsServiceName);
-        for (const watcher of watcherList) {
-          watcher.onResourceDoesNotExist();
-        }
-      }
-    }
-  }
-
   handleResponses(responses: ResourcePair<ClusterLoadAssignment__Output>[], isV2: boolean): HandleResponseResult {
     const validResponses: ClusterLoadAssignment__Output[] = [];
     let result: HandleResponseResult = {

packages/grpc-js-xds/src/xds-stream-state/lds-state.ts

@@ -183,21 +183,15 @@ export class LdsState implements XdsStreamState<Listener__Output> {
     this.latestResponses = validResponses;
     this.latestIsV2 = isV2;
     const allTargetNames = new Set<string>();
-    const allRouteConfigNames = new Set<string>();
     for (const message of validResponses) {
       allTargetNames.add(message.name);
-      const httpConnectionManager = decodeSingleResource(HTTP_CONNECTION_MANGER_TYPE_URL_V3, message.api_listener!.api_listener!.value);
-      if (httpConnectionManager.rds) {
-        allRouteConfigNames.add(httpConnectionManager.rds.route_config_name);
-      }
       const watchers = this.watchers.get(message.name) ?? [];
       for (const watcher of watchers) {
         watcher.onValidUpdate(message, isV2);
       }
     }
     trace('Received LDS response with listener names [' + Array.from(allTargetNames) + ']');
     result.missing = this.handleMissingNames(allTargetNames);
-    this.rdsState.handleMissingNames(allRouteConfigNames);
     return result;
   }
 

packages/grpc-js-xds/src/xds-stream-state/rds-state.ts

@@ -173,16 +173,6 @@ export class RdsState implements XdsStreamState<RouteConfiguration__Output> {
     return true;
   }
 
-  handleMissingNames(allRouteConfigNames: Set<string>) {
-    for (const [routeConfigName, watcherList] of this.watchers.entries()) {
-      if (!allRouteConfigNames.has(routeConfigName)) {
-        for (const watcher of watcherList) {
-          watcher.onResourceDoesNotExist();
-        }
-      }
-    }
-  }
-
   handleResponses(responses: ResourcePair<RouteConfiguration__Output>[], isV2: boolean): HandleResponseResult {
     const validResponses: RouteConfiguration__Output[] = [];
     let result: HandleResponseResult = {

packages/grpc-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

packages/grpc-js/src/subchannel.ts

@@ -555,7 +555,6 @@ export class Subchannel {
           (error as Error).message
       );
     });
-    registerChannelzSocket(this.subchannelAddressString, () => this.getChannelzSocketInfo()!);
   }
 
   private startConnectingInternal() {