Flip the default value of --remote_discard_merkle_trees to true

This commit also removes the experimental_ prefix.
bazelbuild · Oct 25, 2023 · 31c121f · 31c121f
1 parent 6c02329
commit 31c121f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java b/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java
@@ -652,8 +652,8 @@ public RemoteOutputsStrategyConverter() {
   public boolean markToolInputs;
 
   @Option(
-      name = "experimental_remote_discard_merkle_trees",
-      defaultValue = "false",
+      name = "remote_discard_merkle_trees",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.REMOTE,
       effectTags = {OptionEffectTag.UNKNOWN},
       help =

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java
@@ -2186,6 +2186,7 @@ public void buildRemoteActionForRemotePersistentWorkers() throws Exception {
             .build();
     FakeSpawnExecutionContext context = newSpawnExecutionContext(spawn);
     remoteOptions.markToolInputs = true;
+    remoteOptions.remoteDiscardMerkleTrees = false;
     RemoteExecutionService service = newRemoteExecutionService(remoteOptions);
 
     // Check that worker files are properly marked in the merkle tree.
@@ -2277,6 +2278,7 @@ public void buildRemoteActionWithScrubbing() throws Exception {
                                         .setSource("some/path")
                                         .setTarget("another/dir"))))
                 .build());
+    remoteOptions.remoteDiscardMerkleTrees = false;
     RemoteExecutionService service = newRemoteExecutionService(remoteOptions);
 
     RemoteAction remoteAction = service.buildRemoteAction(spawn, context);
@@ -2332,6 +2334,7 @@ public void buildRemoteActionWithPathMapping(@TestParameter boolean remoteMerkle
             .setPathMapper(pathMapper)
             .build();
     FakeSpawnExecutionContext context = newSpawnExecutionContext(spawn);
+    remoteOptions.remoteDiscardMerkleTrees = false;
     RemoteExecutionService service = newRemoteExecutionService(remoteOptions);
 
     // Check that inputs and outputs of the remote action are mapped correctly.