Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Derive worker files hash from a self-describing layout #23701

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Derive worker files hash from a self-describing layout #23701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,8 +690,9 @@ private ToolSignature computePersistentWorkerSignature(Spawn spawn, SpawnExecuti
execRoot, Options.getDefaults(WorkerOptions.class), LocalEnvProvider.NOOP, null);
WorkerKey workerKey = workerParser.compute(spawn, context).getWorkerKey();
Fingerprint fingerprint = new Fingerprint();
// getWorkerFilesCombinedHash always uses SHA-256, so the hash is always 32 bytes.
fingerprint.addBytes(workerKey.getWorkerFilesCombinedHash().asBytes());
fingerprint.addIterableStrings(workerKey.getArgs());
fingerprint.addStrings(workerKey.getArgs());
fingerprint.addStringMap(workerKey.getEnv());
return new ToolSignature(
fingerprint.hexDigestAndReset(), workerKey.getWorkerFilesWithDigests().keySet());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/google/devtools/build/lib/worker/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ java_library(
"//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/actions:runfiles_tree",
"//src/main/java/com/google/devtools/build/lib/unsafe:string",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//third_party:guava",
"//third_party:jsr305",
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/com/google/devtools/build/lib/worker/WorkerFilesHash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import com.google.devtools.build.lib.actions.InputMetadataProvider;
import com.google.devtools.build.lib.actions.RunfilesTree;
import com.google.devtools.build.lib.actions.Spawn;
import com.google.devtools.build.lib.unsafe.StringUnsafe;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
Expand All @@ -47,7 +47,12 @@ public static HashCode getCombinedHash(SortedMap<PathFragment, byte[]> workerFil
Hasher hasher = Hashing.sha256().newHasher();
workerFilesMap.forEach(
(execPath, digest) -> {
hasher.putString(execPath.getPathString(), Charset.defaultCharset());
String execPathString = execPath.getPathString();
hasher.putByte(StringUnsafe.getInstance().getCoder(execPathString));
hasher.putInt(execPathString.length());
hasher.putBytes(StringUnsafe.getInstance().getByteArray(execPathString));

hasher.putInt(digest.length);
hasher.putBytes(digest);
});
return hasher.hash();
Expand All @@ -71,7 +76,7 @@ public static SortedMap<PathFragment, byte[]> getWorkerFilesWithDigests(
/* keepEmptyTreeArtifacts= */ false,
/* keepMiddlemanArtifacts= */ true);
for (ActionInput tool : tools) {
if ((tool instanceof Artifact) && ((Artifact) tool).isMiddlemanArtifact()) {
if (tool instanceof Artifact artifact && artifact.isMiddlemanArtifact()) {
RunfilesTree runfilesTree =
actionInputFileCache.getRunfilesMetadata(tool).getRunfilesTree();
PathFragment root = runfilesTree.getExecPath();
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,7 +2350,7 @@ public void buildRemoteActionForRemotePersistentWorkers() throws Exception {
Platform.Property.newBuilder()
.setName("persistentWorkerKey")
.setValue(
"b22d48cd55755474eae27e63a79306a64146bd5947d5bd3423d78f001cf7b3de"))
"628637504c26bb74fb6bb3f60fb7132b3aa574b866db4181770774882a8853e5"))
.build());
var merkleTree = remoteAction.getMerkleTree();
var outputDirectory =
Expand Down Expand Up @@ -2386,7 +2386,7 @@ public void buildRemoteActionForRemotePersistentWorkers() throws Exception {
Platform.Property.newBuilder()
.setName("persistentWorkerKey")
.setValue(
"b22d48cd55755474eae27e63a79306a64146bd5947d5bd3423d78f001cf7b3de"))
"628637504c26bb74fb6bb3f60fb7132b3aa574b866db4181770774882a8853e5"))
.build());

// Check that if a tool input changes, the persistent worker key changes.
Expand All @@ -2398,7 +2398,7 @@ public void buildRemoteActionForRemotePersistentWorkers() throws Exception {
Platform.Property.newBuilder()
.setName("persistentWorkerKey")
.setValue(
"997337de8dc20123cd7c8fcaed2c9c79cd8138831f9fbbf119f37d0859c9e83a"))
"98e07ff5afc8f4d127e93d326c87c132f89cfd009517422671e6abec2fe05e2b"))
.build());
}

Expand Down