Tasking system changes for 3.13

dralley · dralley · commit 0a1daf0a9115 · 2021-04-20T18:06:26.000-04:00
[noissue]
diff --git a/CHANGES/360.misc b/CHANGES/360.misc
@@ -0,0 +1 @@
+Replaced some uses of deprecated pulpcore functionality.
diff --git a/pulp_python/app/tasks/sync.py b/pulp_python/app/tasks/sync.py
@@ -116,7 +116,7 @@ async def run(self):
                 environ.pop('http_proxy')
             deferred_download = self.remote.policy != Remote.IMMEDIATE
             with ProgressReport(
-                message="Fetching Project Metadata", code="fetching.project"
+                message="Fetching Project Metadata", code="sync.fetching.project"
             ) as p:
                 pmirror = PulpMirror(
                     serial=0,  # Serial currently isn't supported by Pulp
diff --git a/pulp_python/app/viewsets.py b/pulp_python/app/viewsets.py
@@ -11,7 +11,7 @@
     AsyncOperationResponseSerializer,
     RepositorySyncURLSerializer,
 )
-from pulpcore.plugin.tasking import enqueue_with_reservation
+from pulpcore.plugin.tasking import dispatch
 
 from pulp_python.app import models as python_models
 from pulp_python.app import serializers as python_serializers
@@ -49,12 +49,12 @@ def sync(self, request, pk):
         remote = serializer.validated_data.get('remote', repository.remote)
         mirror = serializer.validated_data.get('mirror')
 
-        result = enqueue_with_reservation(
+        result = dispatch(
             tasks.sync,
             [repository, remote],
             kwargs={
-                'remote_pk': remote.pk,
-                'repository_pk': repository.pk,
+                'remote_pk': str(remote.pk),
+                'repository_pk': str(repository.pk),
                 'mirror': mirror
             }
         )
@@ -213,11 +213,11 @@ def create(self, request):
             repository = serializer.validated_data.get('repository')
             repository_version = RepositoryVersion.latest(repository)
 
-        result = enqueue_with_reservation(
+        result = dispatch(
             tasks.publish,
             [repository_version.repository],
             kwargs={
-                'repository_version_pk': repository_version.pk
+                'repository_version_pk': str(repository_version.pk)
             }
         )
         return core_viewsets.OperationPostponedResponse(result, request)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Replaced some uses of deprecated pulpcore functionality.`