Skip to content

Added additional locking during replication#7712

Merged
ggainey merged 1 commit into
pulp:mainfrom
dralley:replication-locking
May 13, 2026
Merged

Added additional locking during replication#7712
ggainey merged 1 commit into
pulp:mainfrom
dralley:replication-locking

Conversation

@dralley
Copy link
Copy Markdown
Contributor

@dralley dralley commented May 13, 2026

Locking didn't prevent two UpstreamPulps with overlapping Distributions from racing and clobbering each other.

Assisted-By: claude-opus-4.6
re #7614

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

Locking didn't prevent two UpstreamPulps with overlapping Distributions
from racing and clobbering each other.

Assisted-By: claude-opus-4.6
re pulp#7614
@ggainey ggainey merged commit e744426 into pulp:main May 13, 2026
46 of 53 checks passed
@patchback
Copy link
Copy Markdown

patchback Bot commented May 13, 2026

Backport to 3.105: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply e744426 on top of patchback/backports/3.105/e7444266b7a1a63b6fe62bdec9bd42f6bd73615d/pr-7712

Backporting merged PR #7712 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulpcore.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.105/e7444266b7a1a63b6fe62bdec9bd42f6bd73615d/pr-7712 upstream/3.105
  4. Now, cherry-pick PR Added additional locking during replication #7712 contents into that branch:
    $ git cherry-pick -x e7444266b7a1a63b6fe62bdec9bd42f6bd73615d
    If it'll yell at you with something like fatal: Commit e7444266b7a1a63b6fe62bdec9bd42f6bd73615d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e7444266b7a1a63b6fe62bdec9bd42f6bd73615d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Added additional locking during replication #7712 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.105/e7444266b7a1a63b6fe62bdec9bd42f6bd73615d/pr-7712
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback
Copy link
Copy Markdown

patchback Bot commented May 13, 2026

Backport to 3.110: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.110/e7444266b7a1a63b6fe62bdec9bd42f6bd73615d/pr-7712

Backported as #7713

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants