commit e6433404f18da686dd4b19a6a9ac9b489d602f1c
author schmitt <schmitt@google.com> Tue Jan 07 12:57:46 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 07 12:58:48 2020 -0800
tree 5e751584ff790f9782c434c6d9a11de8609c231d
parent 8e9c11d14db9c823df9fbe6ca67474934d0c3a48

Simplify ActionContextProvider: remove init().

This method is only implemented in one action context provider and the provided file cache is always strictly derived from the command environment. Move the file cache creation to the command environment instead which is accessible everywhere the cache is needed.

RELNOTES: None.
PiperOrigin-RevId: 288554250

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 9119264..679f8e5 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -31,7 +31,6 @@
 import com.google.devtools.build.lib.actions.Executor;
 import com.google.devtools.build.lib.actions.ExecutorInitException;
 import com.google.devtools.build.lib.actions.LocalHostCapacity;
-import com.google.devtools.build.lib.actions.MetadataProvider;
 import com.google.devtools.build.lib.actions.PackageRoots;
 import com.google.devtools.build.lib.actions.ResourceManager;
 import com.google.devtools.build.lib.actions.ResourceSet;
@@ -63,7 +62,6 @@
 import com.google.devtools.build.lib.exec.CheckUpToDateFilter;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
 import com.google.devtools.build.lib.exec.ExecutorBuilder;
-import com.google.devtools.build.lib.exec.SingleBuildFileCache;
 import com.google.devtools.build.lib.exec.SpawnActionContextMaps;
 import com.google.devtools.build.lib.exec.SymlinkTreeStrategy;
 import com.google.devtools.build.lib.profiler.AutoProfiler;
@@ -121,7 +119,6 @@
   private final BlazeRuntime runtime;
   private final BuildRequest request;
   private BlazeExecutor executor;
-  private final MetadataProvider fileCache;
   private final ActionInputPrefetcher prefetcher;
   private final ImmutableList<ActionContextProvider> actionContextProviders;
   private SpawnActionContextMaps spawnActionContextMaps;
@@ -151,18 +148,9 @@
     builder
         .addStrategyByContext(WorkspaceStatusAction.Context.class, "")
         .addStrategyByContext(SymlinkTreeActionContext.class, "");
-
-    // Unfortunately, the exec root cache is not shared with caches in the remote execution client.
-    this.fileCache =
-        new SingleBuildFileCache(env.getExecRoot().getPathString(), runtime.getFileSystem());
+      
     this.prefetcher = builder.getActionInputPrefetcher();
-
     this.actionContextProviders = builder.getActionContextProviders();
-    for (ActionContextProvider provider : actionContextProviders) {
-      try (SilentCloseable closeable = Profiler.instance().profile(provider + ".init")) {
-        provider.init(fileCache);
-      }
-    }
 
     // There are many different SpawnActions, and we want to control the action context they use
     // independently from each other, for example, to run genrules locally and Java compile action
@@ -689,7 +677,7 @@
         request.getPackageCacheOptions().checkOutputFiles
             ? modifiedOutputFiles
             : ModifiedFileSet.NOTHING_MODIFIED,
-        fileCache,
+        env.getFileCache(),
         prefetcher);
   }