Skip to content

Commit 716b950

Browse files
committed
replaced set_collection_deferred_fields with using only()
1 parent e58da5b commit 716b950

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

pulp_ansible/app/galaxy/v3/views.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
from pulp_ansible.app.tasks.deletion import delete_collection_version, delete_collection
8282

83-
from pulp_ansible.app.utils import filter_content_for_repo_version, set_collection_deferred_fields
83+
from pulp_ansible.app.utils import filter_content_for_repo_version
8484

8585
DOMAIN_ENABLED = settings.DOMAIN_ENABLED
8686

@@ -446,15 +446,9 @@ def destroy(self, request: Request, *args, **kwargs) -> Response:
446446
status=status.HTTP_400_BAD_REQUEST,
447447
)
448448

449-
# Defer loading large JSON fields to prevent memory exhaustion
450-
set_collection_deferred_fields(
451-
["contents", "docs_blob", "manifest", "files", "dependencies"]
452-
)
453-
454449
repositories = set()
455-
for version in collection.versions.all():
456-
for repo in version.repositories.all():
457-
repositories.add(repo)
450+
for version in collection.versions.only("pk"):
451+
repositories.update(version.repositories.values_list("pk", flat=True))
458452

459453
async_result = dispatch(
460454
delete_collection,
@@ -469,9 +463,9 @@ def get_collection_dependents(parent):
469463
"""Given a parent collection, return a list of collection versions that depend on it."""
470464
key = f"{parent.namespace}.{parent.name}"
471465
return list(
472-
CollectionVersion.objects.exclude(collection=parent).filter(
473-
dependencies__has_key=key, pulp_domain=get_domain()
474-
)
466+
CollectionVersion.objects.exclude(collection=parent)
467+
.filter(dependencies__has_key=key, pulp_domain=get_domain())
468+
.only("namespace", "name", "version")
475469
)
476470

477471

pulp_ansible/app/tasks/deletion.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from collections import defaultdict
1818

1919
from pulp_ansible.app.models import Collection, CollectionVersion
20-
from pulp_ansible.app.utils import set_collection_deferred_fields
2120
from pulpcore.plugin.tasking import add_and_remove, orphan_cleanup
2221

2322
log = logging.getLogger(__name__)
@@ -72,11 +71,8 @@ def delete_collection(collection_pk):
7271
2. Run orphan_cleanup to delete the CollectionVersions
7372
3. Delete Collection
7473
"""
75-
# Defer loading large JSON fields to prevent memory exhaustion
76-
set_collection_deferred_fields(["contents", "docs_blob", "manifest", "files", "dependencies"])
77-
7874
collection = Collection.objects.get(pk=collection_pk)
79-
versions = collection.versions.all()
75+
versions = collection.versions.only("pk")
8076
_remove_collection_version_from_repos(versions)
8177
version_pks = versions.values_list("pk", flat=True)
8278

0 commit comments

Comments
 (0)