Harden RepositoryVersion against memoization issues by dralley · Pull Request #7311 · pulp/pulpcore

dralley · 2026-02-11T04:50:14Z

📜 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

dralley · 2026-02-11T05:35:46Z

Working on getting some additional tests + making the output of the data repair command more reasonable. Also fixing failures.

Also adding tests for add / remove / contents >65535 packages re: #5375

Question: should I leave a copy of the old data repair command until 3.115?

pulpcore/tests/unit/models/test_repository.py

mdellweg · 2026-02-17T16:17:55Z

pulpcore/tests/unit/models/test_repository.py

+    content_artifact = ContentArtifact.objects.create(content=content, relative_path="test/path")
+
+    # Attempting to add a queryset of ContentArtifact (not Content) should raise AssertionError
+    with pytest.raises(AssertionError):


Type analysis would have caught that too, i think. But we don't have that. So 👍.

mdellweg · 2026-02-17T16:21:32Z

pulpcore/tests/unit/models/test_repository.py

+    with repository.new_version() as version2:
+        # Remove content that doesn't exist (no-op)
+        version2.remove_content(Content.objects.filter(pk=9999999))
+        # Add content that already exists (no-op)
+        version2.add_content(Content.objects.filter(pk=content_pks[0]))
+


Do we also have as similar test, where the single content is actually removed and then added again so still no new version is generated?

Yes, test_version_identical_to_previous

Well, that tests "adding and then removing" the same content, so I will extend to also cover "removing and then adding" the same content

dralley · 2026-02-17T20:45:46Z

pulpcore/app/models/repository.py

        """
        with transaction.atomic():
+            # relatively inexpensive sanity check for memoization
+            assert len(self.content_ids) == self._content_relationships().count()


Worthwhile?

So basically this is checking that at the end of squash(), that the 'cached' content_ids field of the repoversion, has the same number of elements as recomputing - so this would be like a last-ditch chance to catch coding-errors in "someone's" new-version-creation code, yeah?

Even if it's "just" a count() of the recompute-query - is this actually "inexpensive"? (thinking out loud here) It would only happen once at new-version-squash-time, so that may not be a big issue.

My thinking here is that it's at least not any more expensive than the operations that already have to happen at the beginning of the repository version create (basically this same query) and at the end, including the annotates below.

And probably much less so

closes: 7272 Assisted By: claude (tests only)

ggainey

Looks good - and thanks for the extensive test-suite additions!

patchback · 2026-02-17T23:23:50Z

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

❌ Failed to cleanly apply a6c1a8e on top of patchback/backports/3.73/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311

Backporting merged PR #7311 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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.73/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311 upstream/3.73

Now, cherry-pick PR Harden RepositoryVersion against memoization issues #7311 contents into that branch:
```
$ git cherry-pick -x a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa
```
If it'll yell at you with something like fatal: Commit a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Harden RepositoryVersion against memoization issues #7311 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.73/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311

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 · 2026-02-17T23:23:50Z

Backport to 3.103: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.103/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311

Backported as #7328

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

patchback · 2026-02-17T23:23:50Z

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

❌ Failed to cleanly apply a6c1a8e on top of patchback/backports/3.85/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311

Backporting merged PR #7311 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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.85/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311 upstream/3.85

Now, cherry-pick PR Harden RepositoryVersion against memoization issues #7311 contents into that branch:
```
$ git cherry-pick -x a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa
```
If it'll yell at you with something like fatal: Commit a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Harden RepositoryVersion against memoization issues #7311 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.85/a6c1a8ec470ccbc18bbb0512dfa6aafa4429e6fa/pr-7311

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.

github-actions bot added multi-commit no-changelog no-issue labels Feb 11, 2026

dralley force-pushed the check-versions branch 5 times, most recently from eedd748 to 366381e Compare February 11, 2026 05:30

dralley force-pushed the check-versions branch 10 times, most recently from 012e5cd to 36bd060 Compare February 16, 2026 03:35

github-actions bot removed multi-commit no-changelog labels Feb 16, 2026

dralley force-pushed the check-versions branch 3 times, most recently from cfb77c2 to 7e70dd7 Compare February 16, 2026 04:03

github-actions bot added multi-commit no-changelog labels Feb 16, 2026

dralley force-pushed the check-versions branch from 2f78664 to 77971fe Compare February 16, 2026 20:41

github-actions bot removed the no-changelog label Feb 16, 2026

dralley force-pushed the check-versions branch 2 times, most recently from 1309c12 to 4741e69 Compare February 17, 2026 04:37

dralley force-pushed the check-versions branch 4 times, most recently from 3d29363 to 2199570 Compare February 17, 2026 15:00

github-actions bot added multi-commit no-changelog labels Feb 17, 2026

dralley force-pushed the check-versions branch from 4885a49 to ac93a91 Compare February 17, 2026 15:31

github-actions bot removed multi-commit no-changelog labels Feb 17, 2026

mdellweg reviewed Feb 17, 2026

View reviewed changes

dralley force-pushed the check-versions branch 2 times, most recently from 325dee4 to e088712 Compare February 17, 2026 20:29

dralley marked this pull request as ready for review February 17, 2026 20:29

dralley force-pushed the check-versions branch from e088712 to e5e3c69 Compare February 17, 2026 20:43

dralley commented Feb 17, 2026

View reviewed changes

Harden RepositoryVersion against memoization bugs

e447ce5

closes: 7272 Assisted By: claude (tests only)

dralley force-pushed the check-versions branch from e5e3c69 to e447ce5 Compare February 17, 2026 21:47

ggainey approved these changes Feb 17, 2026

View reviewed changes

dralley enabled auto-merge (rebase) February 17, 2026 22:00

dralley merged commit a6c1a8e into pulp:main Feb 17, 2026
13 checks passed

dralley deleted the check-versions branch February 17, 2026 22:18

dralley added backport-3.73 backport-3.85 backport-3.103 labels Feb 17, 2026

patchback bot mentioned this pull request Feb 17, 2026

[PR #7311/a6c1a8ec backport][3.103] Harden RepositoryVersion against memoization issues #7328

Merged

3 tasks

dralley removed backport-3.73 backport-3.85 labels Feb 17, 2026

Conversation

dralley commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📜 Checklist

Uh oh!

dralley commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mdellweg Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mdellweg Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

dralley Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

dralley Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

dralley Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

ggainey Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

dralley Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dralley Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

ggainey left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

patchback bot commented Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Backporting merged PR #7311 into main

Uh oh!

patchback bot commented Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Backport to 3.103: 💚 backport PR created

Uh oh!

patchback bot commented Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Backporting merged PR #7311 into main

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dralley commented Feb 11, 2026 •

edited

Loading

dralley commented Feb 11, 2026 •

edited

Loading

mdellweg Feb 17, 2026 •

edited

Loading

dralley Feb 17, 2026 •

edited

Loading

patchback bot commented Feb 17, 2026 •

edited

Loading

patchback bot commented Feb 17, 2026 •

edited

Loading

patchback bot commented Feb 17, 2026 •

edited

Loading