From dce6ed777d958d65c7f3d4a2f54f8117778a449e Mon Sep 17 00:00:00 2001 From: Chi Wang Date: Wed, 9 Nov 2022 02:18:31 -0800 Subject: [PATCH] Make `bazel run` works with minimal mode Always use `ToplevelArtifactsDownloader` when building without the bytes. It checks the combination of current command (e.g. `build`, `run`, etc.) and download mode (e.g. `toplevel`, `minimal`) to decide whether download outputs for the toplevel targets or not. Also in the `RunCommand`, we wait for the background downloads before checking the local filesystem. Fixes #11920. Closes #16545. PiperOrigin-RevId: 487181884 Change-Id: I6b1a78a0d032d2cac8093eecf9c4d2e76f90380f --- .../remote/AbstractActionInputPrefetcher.java | 4 ++ .../build/lib/remote/RemoteModule.java | 31 +++++----- .../build/lib/remote/RemoteOutputService.java | 7 +++ .../remote/ToplevelArtifactsDownloader.java | 57 +++++++++++-------- .../build/lib/remote/util/AsyncTaskCache.java | 50 ++++++++++++++++ .../lib/runtime/commands/RunCommand.java | 11 ++++ .../devtools/build/lib/vfs/OutputService.java | 3 + .../remote/build_without_the_bytes_test.sh | 22 +++++++ 8 files changed, 146 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java b/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java index 2b203949f370df..44685de468281b 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java +++ b/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java @@ -564,4 +564,8 @@ public void finalizeAction(Action action, MetadataHandler metadataHandler) { prefetchFiles(outputsToDownload, metadataHandler, Priority.LOW); } } + + public void flushOutputTree() throws InterruptedException { + downloadCache.awaitInProgressTasks(); + } } diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java index 05b2bff825f69a..b383a3796c6fa1 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java @@ -956,22 +956,21 @@ public void executorInit(CommandEnvironment env, BuildRequest request, ExecutorB remoteOutputService.setActionInputFetcher(actionInputFetcher); actionContextProvider.setActionInputFetcher(actionInputFetcher); - if (remoteOutputsMode.downloadToplevelOutputsOnly()) { - toplevelArtifactsDownloader = - new ToplevelArtifactsDownloader( - env.getCommandName(), - env.getSkyframeExecutor().getEvaluator(), - actionInputFetcher, - (path) -> { - FileSystem fileSystem = path.getFileSystem(); - Preconditions.checkState( - fileSystem instanceof RemoteActionFileSystem, - "fileSystem must be an instance of RemoteActionFileSystem"); - return ((RemoteActionFileSystem) path.getFileSystem()) - .getRemoteMetadata(path.asFragment()); - }); - env.getEventBus().register(toplevelArtifactsDownloader); - } + toplevelArtifactsDownloader = + new ToplevelArtifactsDownloader( + env.getCommandName(), + remoteOutputsMode.downloadToplevelOutputsOnly(), + env.getSkyframeExecutor().getEvaluator(), + actionInputFetcher, + (path) -> { + FileSystem fileSystem = path.getFileSystem(); + Preconditions.checkState( + fileSystem instanceof RemoteActionFileSystem, + "fileSystem must be an instance of RemoteActionFileSystem"); + return ((RemoteActionFileSystem) path.getFileSystem()) + .getRemoteMetadata(path.asFragment()); + }); + env.getEventBus().register(toplevelArtifactsDownloader); } } diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteOutputService.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteOutputService.java index bb110b63e8d31d..a293b40408282f 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteOutputService.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteOutputService.java @@ -95,6 +95,13 @@ public ModifiedFileSet startBuild( return ModifiedFileSet.EVERYTHING_MODIFIED; } + @Override + public void flushOutputTree() throws InterruptedException { + if (actionInputFetcher != null) { + actionInputFetcher.flushOutputTree(); + } + } + @Override public void finalizeBuild(boolean buildSuccessful) { // Intentionally left empty. diff --git a/src/main/java/com/google/devtools/build/lib/remote/ToplevelArtifactsDownloader.java b/src/main/java/com/google/devtools/build/lib/remote/ToplevelArtifactsDownloader.java index 1136569264b686..0d2faaa4a193b6 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/ToplevelArtifactsDownloader.java +++ b/src/main/java/com/google/devtools/build/lib/remote/ToplevelArtifactsDownloader.java @@ -62,12 +62,14 @@ private enum CommandMode { private static final GoogleLogger logger = GoogleLogger.forEnclosingClass(); private final CommandMode commandMode; + private final boolean downloadToplevel; private final MemoizingEvaluator memoizingEvaluator; private final AbstractActionInputPrefetcher actionInputPrefetcher; private final PathToMetadataConverter pathToMetadataConverter; public ToplevelArtifactsDownloader( String commandName, + boolean downloadToplevel, MemoizingEvaluator memoizingEvaluator, AbstractActionInputPrefetcher actionInputPrefetcher, PathToMetadataConverter pathToMetadataConverter) { @@ -84,6 +86,7 @@ public ToplevelArtifactsDownloader( default: this.commandMode = CommandMode.UNKNOWN; } + this.downloadToplevel = downloadToplevel; this.memoizingEvaluator = memoizingEvaluator; this.actionInputPrefetcher = actionInputPrefetcher; this.pathToMetadataConverter = pathToMetadataConverter; @@ -133,6 +136,10 @@ public void onFailure(Throwable throwable) { @Subscribe @AllowConcurrentEvents public void onAspectComplete(AspectCompleteEvent event) { + if (!shouldDownloadToplevelOutputs(event.getAspectKey().getBaseConfiguredTargetKey())) { + return; + } + if (event.failed()) { return; } @@ -143,7 +150,7 @@ public void onAspectComplete(AspectCompleteEvent event) { @Subscribe @AllowConcurrentEvents public void onTargetComplete(TargetCompleteEvent event) { - if (!shouldDownloadToplevelOutputsForTarget(event.getConfiguredTargetKey())) { + if (!shouldDownloadToplevelOutputs(event.getConfiguredTargetKey())) { return; } @@ -156,28 +163,32 @@ public void onTargetComplete(TargetCompleteEvent event) { event.getExecutableTargetData().getRunfiles()); } - private boolean shouldDownloadToplevelOutputsForTarget(ConfiguredTargetKey configuredTargetKey) { - if (commandMode != CommandMode.TEST) { - return true; - } - - // Do not download test binary in test mode. - try { - var configuredTargetValue = - (ConfiguredTargetValue) memoizingEvaluator.getExistingValue(configuredTargetKey); - if (configuredTargetValue == null) { - return false; - } - ConfiguredTarget configuredTarget = configuredTargetValue.getConfiguredTarget(); - if (configuredTarget instanceof RuleConfiguredTarget) { - var ruleConfiguredTarget = (RuleConfiguredTarget) configuredTarget; - var isTestRule = isTestRuleName(ruleConfiguredTarget.getRuleClassString()); - return !isTestRule; - } - return true; - } catch (InterruptedException ignored) { - Thread.currentThread().interrupt(); - return false; + private boolean shouldDownloadToplevelOutputs(ConfiguredTargetKey configuredTargetKey) { + switch (commandMode) { + case RUN: + // Always download outputs of toplevel targets in RUN mode + return true; + case TEST: + // Do not download test binary in test mode. + try { + var configuredTargetValue = + (ConfiguredTargetValue) memoizingEvaluator.getExistingValue(configuredTargetKey); + if (configuredTargetValue == null) { + return false; + } + ConfiguredTarget configuredTarget = configuredTargetValue.getConfiguredTarget(); + if (configuredTarget instanceof RuleConfiguredTarget) { + var ruleConfiguredTarget = (RuleConfiguredTarget) configuredTarget; + var isTestRule = isTestRuleName(ruleConfiguredTarget.getRuleClassString()); + return !isTestRule; + } + return true; + } catch (InterruptedException ignored) { + Thread.currentThread().interrupt(); + return false; + } + default: + return downloadToplevel; } } diff --git a/src/main/java/com/google/devtools/build/lib/remote/util/AsyncTaskCache.java b/src/main/java/com/google/devtools/build/lib/remote/util/AsyncTaskCache.java index 07bed15a53b0d0..cd91a72b503226 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/util/AsyncTaskCache.java +++ b/src/main/java/com/google/devtools/build/lib/remote/util/AsyncTaskCache.java @@ -21,10 +21,12 @@ import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.CompletableEmitter; +import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.SingleObserver; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.subjects.AsyncSubject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -131,6 +133,8 @@ class Execution extends Single implements SingleObserver { @GuardedBy("lock") private final List> observers = new ArrayList<>(); + private final AsyncSubject completion = AsyncSubject.create(); + Execution(KeyT key, Single upstream) { this.key = key; this.upstream = upstream; @@ -182,6 +186,9 @@ public void onSuccess(@NonNull ValueT value) { observer.onSuccess(value); } + completion.onNext(value); + completion.onComplete(); + maybeNotifyTermination(); } } @@ -198,6 +205,8 @@ public void onError(@NonNull Throwable error) { observer.onError(error); } + completion.onError(error); + maybeNotifyTermination(); } } @@ -348,6 +357,39 @@ public void shutdown() { } } + /** + * Waits for the in-progress tasks to finish. Any tasks that are submitted after the call are not + * waited. + */ + public void awaitInProgressTasks() throws InterruptedException { + Completable completable = + Completable.defer( + () -> { + ImmutableList executions; + synchronized (lock) { + executions = ImmutableList.copyOf(inProgress.values()); + } + + if (executions.isEmpty()) { + return Completable.complete(); + } + + return Completable.fromPublisher( + Flowable.fromIterable(executions) + .flatMapSingle(e -> Single.fromObservable(e.completion))); + }); + + try { + completable.blockingAwait(); + } catch (RuntimeException e) { + Throwable cause = e.getCause(); + if (cause != null) { + throwIfInstanceOf(cause, InterruptedException.class); + } + throw e; + } + } + /** Waits for the channel to become terminated. */ public void awaitTermination() throws InterruptedException { Completable completable = @@ -493,6 +535,14 @@ public void shutdown() { cache.shutdown(); } + /** + * Waits for the in-progress tasks to finish. Any tasks that are submitted after the call are + * not waited. + */ + public void awaitInProgressTasks() throws InterruptedException { + cache.awaitInProgressTasks(); + } + /** Waits for the cache to become terminated. */ public void awaitTermination() throws InterruptedException { cache.awaitTermination(); diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java index 99bab5bfea0c2b..13069d4bd5aac0 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java @@ -306,6 +306,17 @@ public BlazeCommandResult exec(CommandEnvironment env, OptionsParsingResult opti return BlazeCommandResult.detailedExitCode(result.getDetailedExitCode()); } + // If Bazel is using an output service (e.g. Build without the Bytes), the toplevel outputs + // might still be downloading in the background. Flush the output tree to wait for all the + // downloads complete. + if (env.getOutputService() != null) { + try { + env.getOutputService().flushOutputTree(); + } catch (InterruptedException ignored) { + Thread.currentThread().interrupt(); + } + } + // Make sure that we have exactly 1 built target (excluding --run_under), // and that it is executable. // These checks should only fail if keepGoing is true, because we already did diff --git a/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java b/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java index 4ec0c575dd56de..53517ef2d16434 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/OutputService.java @@ -117,6 +117,9 @@ public default boolean shouldTrustRemoteArtifacts() { ModifiedFileSet startBuild(EventHandler eventHandler, UUID buildId, boolean finalizeActions) throws BuildFailedException, AbruptExitException, InterruptedException; + /** Flush and wait for in-progress downloads. */ + default void flushOutputTree() throws InterruptedException {} + /** * Finish the build. * diff --git a/src/test/shell/bazel/remote/build_without_the_bytes_test.sh b/src/test/shell/bazel/remote/build_without_the_bytes_test.sh index 32494fd8402ef0..d71a9155861164 100755 --- a/src/test/shell/bazel/remote/build_without_the_bytes_test.sh +++ b/src/test/shell/bazel/remote/build_without_the_bytes_test.sh @@ -1331,4 +1331,26 @@ EOF [[ ! -e "bazel-bin/a/liblib.jdeps" ]] || fail "bazel-bin/a/liblib.jdeps shouldn't exist" } +function test_bazel_run_with_minimal() { + # Test that `bazel run` works in minimal mode. + mkdir -p a + + cat > a/BUILD <<'EOF' +genrule( + name = 'bin', + srcs = [], + outs = ['bin.out'], + cmd = "echo 'echo bin-message' > $@", + executable = True, +) +EOF + + bazel run \ + --remote_executor=grpc://localhost:${worker_port} \ + --remote_download_minimal \ + //a:bin >& $TEST_log || fail "Failed to run //a:bin" + + expect_log "bin-message" +} + run_suite "Build without the Bytes tests"