From 4ee662fbcf5cb9b1d3da6b046536890db69e4bc5 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Sat, 7 Jun 2025 07:23:09 -0700
Subject: [PATCH] xds: cancelled=true on watch close in XdsDepManager

1fd29bc80 replaced cancelWatcher() with watcher.close(). But setting
cancelled was missing. Because the config update checks for shutdown,
the cancelled flag no longer avoids exceptions. But it seems best to
continue avoiding any processing after close to avoid surprises.
---
 xds/src/main/java/io/grpc/xds/XdsDependencyManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java b/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
index 78d4dbb198..c0054c1633 100644
--- a/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
+++ b/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
@@ -525,6 +525,7 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
     }
 
     public void close() {
+      cancelled = true;
       xdsClient.cancelXdsResourceWatch(type, resourceName, this);
     }