Skip to content

[6.2.0] Skip empty directories in prefetcher.#17710

Merged
ShreeM01 merged 1 commit intobazelbuild:release-6.2.0from
tjgq:skip-dirs
Mar 9, 2023
Merged

[6.2.0] Skip empty directories in prefetcher.#17710
ShreeM01 merged 1 commit intobazelbuild:release-6.2.0from
tjgq:skip-dirs

Conversation

@tjgq
Copy link
Copy Markdown
Contributor

@tjgq tjgq commented Mar 9, 2023

While non-empty tree artifacts in the inputs to an action are expanded into the files they contain and omitted from the input mapping, empty tree artifacts are still present, as they signal the need to create the directory.

I'm explicitly skipping the empty tree artifacts in prefetchFiles() as otherwise they get skipped as a result of FileArtifactValue#isRemote() returning false for the FileArtifactValue associated with an empty tree artifact (even if it was produced remotely!), which is extremely subtle.

Closes #17183.

[NOTE: this is a combined cherry pick of 763f966 and 4c57def, as the former left Bazel in a broken state.]

PiperOrigin-RevId: 501207095
Change-Id: Ib52727d6fdc6b7a291a61fba33914e57531fb1f4

While non-empty tree artifacts in the inputs to an action are expanded into the files they contain and omitted from the input mapping, empty tree artifacts are still present, as they signal the need to create the directory.

I'm explicitly skipping the empty tree artifacts in prefetchFiles() as otherwise they get skipped as a result of FileArtifactValue#isRemote() returning false for the FileArtifactValue associated with an empty tree artifact (even if it was produced remotely!), which is extremely subtle.

Closes bazelbuild#17183.

[NOTE: this is a combined cherry pick of 763f966 and 4c57def, as the former left Bazel in a broken state.]

PiperOrigin-RevId: 501207095
Change-Id: Ib52727d6fdc6b7a291a61fba33914e57531fb1f4
@tjgq tjgq requested a review from ShreeM01 as a code owner March 9, 2023 16:29
@ShreeM01 ShreeM01 merged commit 9bb4dca into bazelbuild:release-6.2.0 Mar 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants