From dcf47460da01f50a752facbf092949f2031bd3f6 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 24 Sep 2020 14:01:15 -0700
Subject: [PATCH] grpc-js: xDS: Do not remove watchers in
 onResourceDoesNotExist

---
 packages/grpc-js/src/load-balancer-cds.ts | 4 ----
 packages/grpc-js/src/load-balancer-eds.ts | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/packages/grpc-js/src/load-balancer-cds.ts b/packages/grpc-js/src/load-balancer-cds.ts
index 01cc4c62..71a72c89 100644
--- a/packages/grpc-js/src/load-balancer-cds.ts
+++ b/packages/grpc-js/src/load-balancer-cds.ts
@@ -86,10 +86,6 @@ export class CdsLoadBalancer implements LoadBalancer {
         );
       },
       onResourceDoesNotExist: () => {
-        this.xdsClient?.removeClusterWatcher(
-          this.latestConfig!.cds.cluster,
-          this.watcher
-        );
         this.isWatcherActive = false;
         this.channelControlHelper.updateState(ConnectivityState.TRANSIENT_FAILURE, new UnavailablePicker({code: Status.UNAVAILABLE, details: 'CDS resource does not exist', metadata: new Metadata()}));
         this.childBalancer.destroy();
diff --git a/packages/grpc-js/src/load-balancer-eds.ts b/packages/grpc-js/src/load-balancer-eds.ts
index ccc56e9f..902b28b5 100644
--- a/packages/grpc-js/src/load-balancer-eds.ts
+++ b/packages/grpc-js/src/load-balancer-eds.ts
@@ -140,10 +140,6 @@ export class EdsLoadBalancer implements LoadBalancer {
         this.updateChild();
       },
       onResourceDoesNotExist: () => {
-        this.xdsClient?.removeEndpointWatcher(
-          this.edsServiceName!,
-          this.watcher
-        );
         this.isWatcherActive = false;
         this.channelControlHelper.updateState(ConnectivityState.TRANSIENT_FAILURE, new UnavailablePicker({code: Status.UNAVAILABLE, details: 'EDS resource does not exist', metadata: new Metadata()}));
         this.childBalancer.destroy();