Skip to content

Commit

Permalink
Move WorkerFileHash to a separate build target.
Browse files Browse the repository at this point in the history
Move the `WorkerFileHash` utility class to a separate target and add an exception for missing input metadata.

PiperOrigin-RevId: 431803941
  • Loading branch information
alexjski authored and copybara-github committed Mar 2, 2022
1 parent 3931c4c commit b891f9e
Show file tree
Hide file tree
Showing 4 changed files with 233 additions and 7 deletions.
19 changes: 16 additions & 3 deletions src/main/java/com/google/devtools/build/lib/worker/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ java_library(
srcs = glob(
["*.java"],
exclude = [
"WorkerFilesHash.java",
"WorkerSpawnRunner.java",
"WorkerModule.java",
"WorkerParser.java",
Expand All @@ -25,10 +26,7 @@ java_library(
"//third_party/protobuf:protobuf_java",
"//third_party/protobuf:protobuf_java_util",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
"//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
"//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
"//src/main/java/com/google/devtools/build/lib/events",
"//src/main/java/com/google/devtools/build/lib/sandbox:sandbox_helpers",
Expand All @@ -48,6 +46,20 @@ java_library(
],
)

java_library(
name = "worker_files_hash",
srcs = ["WorkerFilesHash.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//third_party:guava",
"//third_party:jsr305",
],
)

java_library(
name = "worker_spawn_runner",
srcs = [
Expand All @@ -56,6 +68,7 @@ java_library(
],
deps = [
":worker",
":worker_files_hash",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
import javax.annotation.Nullable;

/**
* Calculates the hash based on the files, which should be unchanged on disk for a worker to get
* reused.
*/
class WorkerFilesHash {
public class WorkerFilesHash {

static HashCode getCombinedHash(SortedMap<PathFragment, byte[]> workerFilesMap) {
private WorkerFilesHash() {}

public static HashCode getCombinedHash(SortedMap<PathFragment, byte[]> workerFilesMap) {
Hasher hasher = Hashing.sha256().newHasher();
workerFilesMap.forEach(
(execPath, digest) -> {
Expand All @@ -52,15 +55,21 @@ static HashCode getCombinedHash(SortedMap<PathFragment, byte[]> workerFilesMap)
/**
* Return a map that contains the execroot relative path and hash of each tool and runfiles
* artifact of the given spawn.
*
* @throws MissingInputException if metadata is missing for any of the worker files.
*/
static SortedMap<PathFragment, byte[]> getWorkerFilesWithDigests(
public static SortedMap<PathFragment, byte[]> getWorkerFilesWithDigests(
Spawn spawn, ArtifactExpander artifactExpander, MetadataProvider actionInputFileCache)
throws IOException {
TreeMap<PathFragment, byte[]> workerFilesMap = new TreeMap<>();

List<ActionInput> tools =
ActionInputHelper.expandArtifacts(spawn.getToolFiles(), artifactExpander);
for (ActionInput tool : tools) {
@Nullable FileArtifactValue metadata = actionInputFileCache.getMetadata(tool);
if (metadata == null) {
throw new MissingInputException(tool);
}
workerFilesMap.put(tool.getExecPath(), actionInputFileCache.getMetadata(tool).getDigest());
}

Expand All @@ -71,7 +80,10 @@ static SortedMap<PathFragment, byte[]> getWorkerFilesWithDigests(
for (Map.Entry<PathFragment, Artifact> mapping : rootAndMappings.getValue().entrySet()) {
Artifact localArtifact = mapping.getValue();
if (localArtifact != null) {
FileArtifactValue metadata = actionInputFileCache.getMetadata(localArtifact);
@Nullable FileArtifactValue metadata = actionInputFileCache.getMetadata(localArtifact);
if (metadata == null) {
throw new MissingInputException(localArtifact);
}
if (metadata.getType().isFile()) {
workerFilesMap.put(root.getRelative(mapping.getKey()), metadata.getDigest());
}
Expand All @@ -81,4 +93,11 @@ static SortedMap<PathFragment, byte[]> getWorkerFilesWithDigests(

return workerFilesMap;
}

/** Exception thrown when the metadata for a tool/runfile is missing. */
public static final class MissingInputException extends RuntimeException {
private MissingInputException(ActionInput input) {
super(String.format("Missing input metadata for: '%s'", input.getExecPathString()));
}
}
}
8 changes: 8 additions & 0 deletions src/test/java/com/google/devtools/build/lib/worker/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ java_library(
":testutil",
"//src/main/java/com/google/devtools/build/lib:runtime",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:action_input_helper",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
"//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
"//src/main/java/com/google/devtools/build/lib/actions:resource_manager",
"//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
"//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
Expand All @@ -93,15 +96,20 @@ java_library(
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//src/main/java/com/google/devtools/build/lib/worker",
"//src/main/java/com/google/devtools/build/lib/worker:worker_files_hash",
"//src/main/java/com/google/devtools/build/lib/worker:worker_module",
"//src/main/java/com/google/devtools/build/lib/worker:worker_spawn_runner",
"//src/main/java/com/google/devtools/common/options",
"//src/main/protobuf:worker_protocol_java_proto",
"//src/test/java/com/google/devtools/build/lib/actions/util",
"//src/test/java/com/google/devtools/build/lib/exec/util",
"//src/test/java/com/google/devtools/build/lib/testutil",
"//src/test/java/com/google/devtools/build/lib/testutil:TestUtils",
"//src/test/java/com/google/devtools/build/lib/vfs/util",
"//third_party:apache_commons_pool2",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:mockito",
"//third_party:truth",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
// Copyright 2022 The Bazel Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.devtools.build.lib.worker;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.ActionInput;
import com.google.devtools.build.lib.actions.ActionInputHelper;
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
import com.google.devtools.build.lib.actions.ArtifactRoot;
import com.google.devtools.build.lib.actions.ArtifactRoot.RootType;
import com.google.devtools.build.lib.actions.FileArtifactValue;
import com.google.devtools.build.lib.actions.MetadataProvider;
import com.google.devtools.build.lib.actions.Spawn;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.exec.util.SpawnBuilder;
import com.google.devtools.build.lib.testutil.Scratch;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.lib.worker.WorkerFilesHash.MissingInputException;
import java.io.IOException;
import java.util.SortedMap;
import javax.annotation.Nullable;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

/** Tests for {@link WorkerFilesHash}. */
@RunWith(JUnit4.class)
public final class WorkerFilesHashTest {

private final ArtifactRoot outputRoot =
ArtifactRoot.asDerivedRoot(new Scratch().resolve("/execroot"), RootType.Output, "bazel-out");

@Test
public void getWorkerFilesWithDigests_returnsToolsWithCorrectDigests() throws Exception {
byte[] tool1Digest = "text1".getBytes(UTF_8);
byte[] tool2Digest = "text2".getBytes(UTF_8);
MetadataProvider metadataProvider =
createMetadataProvider(
ImmutableMap.of(
"tool1", fileArtifactValue(tool1Digest), "tool2", fileArtifactValue(tool2Digest)));
Spawn spawn =
new SpawnBuilder()
.withTool(ActionInputHelper.fromPath("tool1"))
.withTool(ActionInputHelper.fromPath("tool2"))
.build();

SortedMap<PathFragment, byte[]> filesWithDigests =
WorkerFilesHash.getWorkerFilesWithDigests(
spawn, (ignored1, ignored2) -> {}, metadataProvider);

assertThat(filesWithDigests)
.containsExactly(
PathFragment.create("tool1"), tool1Digest, PathFragment.create("tool2"), tool2Digest)
.inOrder();
}

@Test
public void getWorkerFilesWithDigests_treeArtifactTool_returnsExpanded() throws Exception {
SpecialArtifact tree = createTreeArtifact("tree");
TreeFileArtifact child1 = TreeFileArtifact.createTreeOutput(tree, "child1");
TreeFileArtifact child2 = TreeFileArtifact.createTreeOutput(tree, "child2");
byte[] child1Digest = "text1".getBytes(UTF_8);
byte[] child2Digest = "text2".getBytes(UTF_8);
MetadataProvider metadataProvider =
createMetadataProvider(
ImmutableMap.of(
child1.getExecPathString(),
fileArtifactValue(child1Digest),
child2.getExecPathString(),
fileArtifactValue(child2Digest)));
Spawn spawn = new SpawnBuilder().withTool(tree).build();
ArtifactExpander expander =
(artifact, output) -> {
if (artifact.equals(tree)) {
output.add(TreeFileArtifact.createTreeOutput(tree, "child1"));
output.add(TreeFileArtifact.createTreeOutput(tree, "child2"));
}
};

SortedMap<PathFragment, byte[]> filesWithDigests =
WorkerFilesHash.getWorkerFilesWithDigests(spawn, expander, metadataProvider);

assertThat(filesWithDigests)
.containsExactly(child1.getExecPath(), child1Digest, child2.getExecPath(), child2Digest)
.inOrder();
}

@Test
public void getWorkerFilesWithDigests_spawnWithInputsButNoTools_returnsEmpty() throws Exception {
MetadataProvider metadataProvider = createMetadataProvider(ImmutableMap.of());
Spawn spawn = new SpawnBuilder().withInputs("file1", "file2").build();

SortedMap<PathFragment, byte[]> filesWithDigests =
WorkerFilesHash.getWorkerFilesWithDigests(
spawn, (ignored1, ignored2) -> {}, metadataProvider);

assertThat(filesWithDigests).isEmpty();
}

@Test
public void getWorkerFilesWithDigests_missingDigestForTool_fails() {
MetadataProvider metadataProvider = createMetadataProvider(ImmutableMap.of());
Spawn spawn = new SpawnBuilder().withTool(ActionInputHelper.fromPath("tool")).build();

assertThrows(
MissingInputException.class,
() ->
WorkerFilesHash.getWorkerFilesWithDigests(
spawn, (ignored1, ignored2) -> {}, metadataProvider));
}

@Test
public void getWorkerFilesWithDigests_ioExceptionForToolMetadata_fails() {
IOException injected = new IOException("oh no");
MetadataProvider metadataProvider = createMetadataProvider(ImmutableMap.of("tool", injected));
Spawn spawn = new SpawnBuilder().withTool(ActionInputHelper.fromPath("tool")).build();

IOException thrown =
assertThrows(
IOException.class,
() ->
WorkerFilesHash.getWorkerFilesWithDigests(
spawn, (ignored1, ignored2) -> {}, metadataProvider));

assertThat(thrown).isSameInstanceAs(injected);
}

private static MetadataProvider createMetadataProvider(
ImmutableMap<String, Object> inputMetadataOrExceptions) {
return new MetadataProvider() {
@Nullable
@Override
public FileArtifactValue getMetadata(ActionInput input) throws IOException {
@Nullable
Object metadataOrException = inputMetadataOrExceptions.get(input.getExecPathString());
if (metadataOrException == null) {
return null;
}
if (metadataOrException instanceof IOException) {
throw (IOException) metadataOrException;
}
if (metadataOrException instanceof FileArtifactValue) {
return (FileArtifactValue) metadataOrException;
}
throw new AssertionError("Unexpected value: " + metadataOrException);
}

@Nullable
@Override
public ActionInput getInput(String execPath) {
throw new UnsupportedOperationException();
}
};
}

private static FileArtifactValue fileArtifactValue(byte[] digest) {
FileArtifactValue value = mock(FileArtifactValue.class);
when(value.getDigest()).thenReturn(digest);
return value;
}

private SpecialArtifact createTreeArtifact(String rootRelativePath) {
return ActionsTestUtil.createTreeArtifactWithGeneratingAction(
outputRoot, outputRoot.getExecPath().getRelative(rootRelativePath));
}
}

0 comments on commit b891f9e

Please sign in to comment.