revert back changes and cleanup nonce if subscription is empty

lujiajing1126 · lujiajing1126 · commit 041809d80170 · 2024-06-06T09:59:02.000+08:00
Signed-off-by: Megrez Lu &lt;lujiajing1126@gmail.com&gt;
diff --git a/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java b/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java
@@ -133,7 +133,7 @@ public void run() {
         xdsTransport.shutdown();
       }
     });
-  }
+  }r
 
   @Override
   public String toString() {
@@ -152,8 +152,12 @@ void adjustResourceSubscription(XdsResourceType<?> resourceType) {
       startRpcStream();
     }
     Collection<String> resources = resourceStore.getSubscribedResources(serverInfo, resourceType);
-    adsStream.sendDiscoveryRequest(resourceType,
-            resources == null ? Collections.emptySet() : resources);
+    if (resources != null) {
+      adsStream.sendDiscoveryRequest(resourceType, resources);
+    } else {
+      // cleanup the nonce for the resource type if it's not subscribed to anymore.
+      adsStream.respNonces.remove(resourceType);
+    }
   }
 
   /**
diff --git a/xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java b/xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java
@@ -291,6 +291,7 @@ public void run() {
           }
           if (resourceSubscribers.get(type).isEmpty()) {
             resourceSubscribers.remove(type);
+            subscribedResourceTypeUrls.remove(type.typeUrl());
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,7 @@ public void run() {`
`291`	`291`	`}`
`292`	`292`	`if (resourceSubscribers.get(type).isEmpty()) {`
`293`	`293`	`resourceSubscribers.remove(type);`
	`294`	`+ subscribedResourceTypeUrls.remove(type.typeUrl());`
`294`	`295`	`}`
`295`	`296`	`}`
`296`	`297`	`}`