Stop prefetching inputs in RemoteSpawnCache.

The various SpawnRunners already do it.

Also stop reporting a SpawnExecutingEvent. After the changes in d46aed6, this is no longer needed to ensure the UI tracker still reports "remote-cache" after other strategies transition to a later state.

PiperOrigin-RevId: 516797530
Change-Id: Ic7329ea510e5d070425c7910b2e1ae41da862f7e

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java

@@ -32,7 +32,6 @@
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.exec.SpawnCache;
 import com.google.devtools.build.lib.exec.SpawnCheckingCacheEvent;
-import com.google.devtools.build.lib.exec.SpawnExecutingEvent;
 import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.ProfilerTask;
@@ -54,9 +53,6 @@ final class RemoteSpawnCache implements SpawnCache {
   private static final SpawnCheckingCacheEvent SPAWN_CHECKING_CACHE_EVENT =
       SpawnCheckingCacheEvent.create("remote-cache");
 
-  private static final SpawnExecutingEvent SPAWN_EXECUTING_EVENT =
-      SpawnExecutingEvent.create("remote-cache");
-
   private final Path execRoot;
   private final RemoteOptions options;
   private final boolean verboseFailures;
@@ -150,10 +146,6 @@ public CacheHandle lookup(Spawn spawn, SpawnExecutionContext context)
       }
     }
 
-    context.prefetchInputsAndWait();
-
-    context.report(SPAWN_EXECUTING_EVENT);
-
     if (shouldUploadLocalResults) {
       return new CacheHandle() {
         @Override

src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java

@@ -60,7 +60,6 @@
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.exec.SpawnCache.CacheHandle;
 import com.google.devtools.build.lib.exec.SpawnCheckingCacheEvent;
-import com.google.devtools.build.lib.exec.SpawnExecutingEvent;
 import com.google.devtools.build.lib.exec.SpawnInputExpander;
 import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus;
 import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
@@ -352,10 +351,7 @@ public void cacheMiss() throws Exception {
     doNothing().when(service).uploadOutputs(any(), any());
     entry.store(result);
     verify(service).uploadOutputs(any(), any());
-    assertThat(progressUpdates)
-        .containsExactly(
-            SpawnCheckingCacheEvent.create("remote-cache"),
-            SpawnExecutingEvent.create("remote-cache"));
+    assertThat(progressUpdates).containsExactly(SpawnCheckingCacheEvent.create("remote-cache"));
   }
 
   @Test
@@ -508,10 +504,7 @@ public void failedActionsAreNotUploaded() throws Exception {
             .build();
     entry.store(result);
     verify(service, never()).uploadOutputs(any(), any());
-    assertThat(progressUpdates)
-        .containsExactly(
-            SpawnCheckingCacheEvent.create("remote-cache"),
-            SpawnExecutingEvent.create("remote-cache"));
+    assertThat(progressUpdates).containsExactly(SpawnCheckingCacheEvent.create("remote-cache"));
   }
 
   @Test
@@ -542,10 +535,7 @@ public void printWarningIfDownloadFails() throws Exception {
     Event evt = eventHandler.getEvents().get(0);
     assertThat(evt.getKind()).isEqualTo(EventKind.WARNING);
     assertThat(evt.getMessage()).contains("UNAVAILABLE");
-    assertThat(progressUpdates)
-        .containsExactly(
-            SpawnCheckingCacheEvent.create("remote-cache"),
-            SpawnExecutingEvent.create("remote-cache"));
+    assertThat(progressUpdates).containsExactly(SpawnCheckingCacheEvent.create("remote-cache"));
   }
 
   @Test
@@ -589,10 +579,7 @@ public CachedActionResult answer(InvocationOnMock invocation) {
     doNothing().when(service).uploadOutputs(any(), any());
     entry.store(result);
     verify(service).uploadOutputs(any(), eq(result));
-    assertThat(progressUpdates)
-        .containsExactly(
-            SpawnCheckingCacheEvent.create("remote-cache"),
-            SpawnExecutingEvent.create("remote-cache"));
+    assertThat(progressUpdates).containsExactly(SpawnCheckingCacheEvent.create("remote-cache"));
     assertThat(eventHandler.getEvents()).isEmpty(); // no warning is printed.
   }