Remove --experimental_throttle_action_cache_check flag.

There is no reason to disable it. PiperOrigin-RevId: 545594575 Change-Id: Ic61f96a9d1aae49b653a1c1206f9f8fd06eca691
coeuvre · Jul 5, 2023 · 1e17348 · 1e17348
1 parent 232d848
commit 1e17348
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -967,16 +967,6 @@ public OutputPathsConverter() {
               + " of failing. This is to help use cquery diagnose failures in select.")
   public boolean debugSelectsAlwaysSucceed;
 
-  @Option(
-      name = "experimental_throttle_action_cache_check",
-      defaultValue = "true",
-      converter = BooleanConverter.class,
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      metadataTags = OptionMetadataTag.EXPERIMENTAL,
-      effectTags = {OptionEffectTag.EXECUTION},
-      help = "Whether to throttle the check whether an action is cached.")
-  public boolean throttleActionCacheCheck;
-
   /** Ways configured targets may provide the {@link Fragment}s they require. */
   public enum IncludeConfigFragmentsEnum {
     /**

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
@@ -26,6 +26,7 @@
 import com.google.devtools.build.lib.runtime.CommandEnvironment;
 import com.google.devtools.build.lib.util.ResourceFileLoader;
 import com.google.devtools.common.options.Converters;
+import com.google.devtools.common.options.Converters.BooleanConverter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
@@ -475,6 +476,16 @@ public static class BuildGraveyardOptions extends OptionsBase {
                 + "to ensure correctness of builds.",
         effectTags = {OptionEffectTag.AFFECTS_OUTPUTS})
     public boolean checkFilesetDependenciesRecursively;
+
+    @Option(
+        name = "experimental_throttle_action_cache_check",
+        defaultValue = "true",
+        converter = BooleanConverter.class,
+        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+        metadataTags = OptionMetadataTag.EXPERIMENTAL,
+        effectTags = {OptionEffectTag.EXECUTION},
+        help = "no-op")
+    public boolean throttleActionCacheCheck;
   }
 
   /** This is where deprecated Bazel-specific options only used by the build command go to die. */

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -308,10 +308,7 @@ void prepareForExecution(
     freeDiscoveredInputsAfterExecution =
         !trackIncrementalState && options.getOptions(CoreOptions.class).actionListeners.isEmpty();
 
-    this.cacheHitSemaphore =
-        options.getOptions(CoreOptions.class).throttleActionCacheCheck
-            ? new Semaphore(ResourceUsage.getAvailableProcessors())
-            : null;
+    this.cacheHitSemaphore = new Semaphore(ResourceUsage.getAvailableProcessors());
 
     this.actionExecutionSemaphore =
         buildRequestOptions.useSemaphoreForJobs ? new Semaphore(buildRequestOptions.jobs) : null;