Checkpoint More fixes from rebasing

Author: larry-safran

xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java

@@ -164,8 +164,6 @@ void adjustResourceSubscription(XdsResourceType<?> resourceType) {
       resources = Collections.emptyList();
     }
     adsStream.sendDiscoveryRequest(resourceType, resources);
-    resourceStore.startMissingResourceTimers(resources, resourceType);
-
     if (resources.isEmpty()) {
       // The resource type no longer has subscribing resources; clean up references to it
       versions.remove(resourceType);

xds/src/main/java/io/grpc/xds/client/XdsClient.java

@@ -420,19 +420,12 @@ interface XdsResponseHandler {
     /** Called when a xds response is received. */
     void handleResourceResponse(
         XdsResourceType<?> resourceType, ServerInfo serverInfo, String versionInfo,
-        List<Any> resources, String nonce, ProcessingTracker processingTracker);
+        List<Any> resources, String nonce, boolean isFirstResponse,
+        ProcessingTracker processingTracker);
 
     /** Called when the ADS stream is closed passively. */
     // Must be synchronized.
     void handleStreamClosed(Status error, boolean shouldTryFallback);
-
-    /** Called when the ADS stream has established communication with the xds server.
-     * Is expected to manage the ControlPlanClients and cache updates associated with
-     * Moving to or from a fallback server.
-     *
-     * <p>Must be synchronized.
-     */
-    void handleStreamRestarted(ServerInfo serverInfo);
   }
 
   public interface ResourceStore {

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

@@ -201,20 +201,6 @@ public Collection<String> getSubscribedResources(
     return retVal.isEmpty() ? null : retVal;
   }
 
-  @Override
-  public void startMissingResourceTimers(Collection<String> resourceNames,
-                                         XdsResourceType<?> resourceType) {
-    Map<String, ResourceSubscriber<? extends ResourceUpdate>> subscriberMap =
-        resourceSubscribers.get(resourceType);
-
-    for (String resourceName : resourceNames) {
-      ResourceSubscriber<?> subscriber = subscriberMap.get(resourceName);
-      if (subscriber.respTimer == null && !subscriber.hasResult()) {
-        subscriber.restartTimer();
-      }
-    }
-  }
-
   // As XdsClient APIs becomes resource agnostic, subscribed resource types are dynamic.
   // ResourceTypes that do not have subscribers does not show up in the snapshot keys.
   @Override

xds/src/test/java/io/grpc/xds/ControlPlaneRule.java

@@ -89,15 +89,11 @@ public class ControlPlaneRule extends TestWatcher {
   private XdsTestControlPlaneService controlPlaneService;
   private XdsTestLoadReportingService loadReportingService;
   private XdsNameResolverProvider nameResolverProvider;
-  private final int port;
+  private int port; // Only change from 0 to actual port used in the server.
 
   public ControlPlaneRule() {
-    this(0);
-  }
-
-  public ControlPlaneRule(int port) {
     serverHostName = "test-server";
-    this.port = port;
+    this.port = 0;
   }
 
   public ControlPlaneRule setServerHostName(String serverHostName) {
@@ -153,9 +149,9 @@ public Server getServer() {
    * Will shutdown existing server if needed.
    * Then creates a new server in the same way as {@link #starting(Description)} and starts it.
    */
-  public void restartTdServer() {
+  public void restartXdsServer() {
 
-    if (getServer() != null && !getServer().isShutdown()) {
+    if (getServer() != null && !getServer().isTerminated()) {
       getServer().shutdownNow();
       try {
         if (!getServer().awaitTermination(5, TimeUnit.SECONDS)) {
@@ -179,6 +175,10 @@ private void createAndStartXdsServer() throws IOException {
         .addService(loadReportingService)
         .build()
         .start();
+
+    if (port == 0) {
+      port = server.getPort();
+    }
   }
 
   /**

xds/src/test/java/io/grpc/xds/CsdsServiceTest.java

@@ -503,12 +503,6 @@ public Collection<String> getSubscribedResources(
       return null;
     }
 
-    @Override
-    public void startMissingResourceTimers(Collection<String> resourceNames,
-                                           XdsResourceType<?> resourceType) {
-      // do nothing
-    }
-
     @Override
     public Map<String, XdsResourceType<?>> getSubscribedResourceTypesWithTypeUrl() {
       return ImmutableMap.of();
@@ -559,7 +553,6 @@ public void setBootstrapOverride(Map<String, ?> bootstrap) {
       throw new UnsupportedOperationException("Should not be called");
     }
 
-
     @Override
     public ObjectPool<XdsClient> getOrCreate(String target, MetricRecorder metricRecorder) {
       throw new UnsupportedOperationException("Should not be called");