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.

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

create git caches atomically (backport #11581) #11599

Closed

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 26, 2024

When working on speeding up the CI,
I triggered a race condition in the creation of the tarball cache. This code now instead will ensure that half-initialized repositories are no longer visible to any other nix process.

This is the error message that I got before:

error: opening Git repository '"/Users/runner/.cache/nix/tarball-cache"': could not find repository at '/Users/runner/.cache/nix/tarball-cache'

Motivation

Context

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #11581 done by [Mergify](https://mergify.com).

When working on speeding up the CI,
I triggered a race condition in the creation of the tarball cache.
This code now instead will ensure that half-initialized repositories
are no longer visible to any other nix process.

This is the error message that I got before:

error: opening Git repository '"/Users/runner/.cache/nix/tarball-cache"': could not find repository at '/Users/runner/.cache/nix/tarball-cache'
(cherry picked from commit 12d5b2c)

# Conflicts:
#	src/libfetchers/git-utils.cc
Copy link
Author

mergify bot commented Sep 26, 2024

Cherry-pick of 12d5b2c has failed:

On branch mergify/bp/2.24-maintenance/pr-11581
Your branch is up to date with 'origin/2.24-maintenance'.

You are currently cherry-picking commit 12d5b2cfa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libfetchers/git-utils.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from edolstra as a code owner September 26, 2024 19:59
@github-actions github-actions bot added the fetching Networking with the outside (non-Nix) world, input locking label Sep 26, 2024
@Mic92
Copy link
Member

Mic92 commented Sep 27, 2024

Merge conflict solved in #11601

@Mic92 Mic92 closed this Sep 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts fetching Networking with the outside (non-Nix) world, input locking merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant