Simplify subrepo deletion #3343
Conversation
dralley
requested review from
ipanova and
dralley
and removed request for
ipanova
| @@ -107,8 +107,8 @@ def repositories(self): | |||
| """ | |||
| from pulp_rpm.app.models import RpmRepository | |||
|
|
|||
| repo_ids = list(self.addons.values_list("repository__pk", flat=True)) | |||
| repo_ids += list(self.variants.values_list("repository__pk", flat=True)) | |||
| repo_ids = list(self.addons.values_list("repository_id", flat=True)) | |||
| @@ -331,19 +331,10 @@ class Meta: | |||
| ) | |||
|
|
|||
|
|
|||
| @receiver(post_delete, sender=Addon) | |||
| @receiver(post_delete, sender=Variant) | |||
| @receiver(pre_delete, sender=DistributionTree) | |||
|
Yes, please file an issue |
gerrod3
force-pushed
the
better-tree-delete
branch
2 times, most recently
from
9444b8e
to
2d21c03
Compare
pulp_rpm/app/models/distribution.py
Outdated
| @@ -255,7 +255,7 @@ class Addon(BaseModel): | |||
| distribution_tree = models.ForeignKey( | |||
| DistributionTree, on_delete=models.CASCADE, related_name="addons" | |||
| ) | |||
| repository = models.ForeignKey(Repository, on_delete=models.PROTECT, related_name="addons") | |||
| repository = models.ForeignKey(Repository, on_delete=models.DO_NOTHING, related_name="addons") | |||
There was a problem hiding this comment.
Wait - why? The repository link is a fundamental piece of this object (unfortunately). I'm a bit worried this opens us up to integrity issues
If we can keep the nice properties of your new approach while leaving these protections in place and deleting the Addons and Variants first, let's do that if possible.
There was a problem hiding this comment.
I've switched it to use RESTRICT so you can't mindlessly delete the sub-repository unless the DistributionTree is being deleted. https://docs.djangoproject.com/en/4.2/ref/models/fields/#django.db.models.RESTRICT
I had to change the signal logic slightly to do some sleight of hand operations to be able to still find the subrepos to delete.
gerrod3
force-pushed
the
better-tree-delete
branch
from
2d21c03
to
53f782d
Compare
gerrod3
force-pushed
the
better-tree-delete
branch
from
53f782d
to
0c4e26e
Compare
The previous cleanup method was being called multiple times for each addon & varriant present in a DistributionTree, now it should only be called once per DistributionTree deleted.