pulpcore 3.85.1__tar.gz → 3.87.0__tar.gz

{pulpcore-3.85.1 → pulpcore-3.87.0}/CHANGES.md

@@ -8,6 +8,67 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.87.0 (2025-08-29) {: #3.87.0 }
+
+### REST API {: #3.87.0-rest-api }
+
+#### Bugfixes {: #3.87.0-rest-api-bugfix }
+
+- Fixed apps crashing in a loop on restart with the same name.
+  [#6880](https://github.com/pulp/pulpcore/issues/6880)
+
+### Plugin API {: #3.87.0-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.87.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.87.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.86.0 (2025-08-21) {: #3.86.0 }
+
+### REST API {: #3.86.0-rest-api }
+
+#### Features {: #3.86.0-rest-api-feature }
+
+- Added a configurable bucket boundary for API request duration metric using the OTEL_PULP_API_HISTOGRAM_BUCKETS setting.
+  [#6845](https://github.com/pulp/pulpcore/issues/6845)
+
+#### Bugfixes {: #3.86.0-rest-api-bugfix }
+
+- Made DjangoMetricsMiddleware aware of OTEL urls exclusion envvars.
+  [#6843](https://github.com/pulp/pulpcore/issues/6843)
+- Fixed repository version validation to allow legitimate shared artifacts between content units.
+  [#6868](https://github.com/pulp/pulpcore/issues/6868)
+- Fixed a bug that prevents migrations from running.
+
+#### Improved Documentation {: #3.86.0-rest-api-doc }
+
+- Updated documentation for the TASK_DIAGNOSTICS setting.
+  [#6854](https://github.com/pulp/pulpcore/issues/6854)
+
+### Plugin API {: #3.86.0-plugin-api }
+
+#### Removals {: #3.86.0-plugin-api-removal }
+
+- Removed support for synchronous immediate tasks.
+
+### Pulp File {: #3.86.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.86.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.85.1 (2025-08-12) {: #3.85.1 }
 
 ### REST API {: #3.85.1-rest-api }

{pulpcore-3.85.1 → pulpcore-3.87.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.85.1
+Version: 3.87.0
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -45,12 +45,12 @@ Requires-Dist: PyOpenSSL<26.0
 Requires-Dist: opentelemetry-api<1.37,>=1.27.0
 Requires-Dist: opentelemetry-sdk<1.37,>=1.27.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.37,>=1.27.0
-Requires-Dist: protobuf<6.0,>=4.21.1
+Requires-Dist: protobuf<7.0,>=4.21.1
 Requires-Dist: pulp-glue<0.36,>=0.28.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
 Requires-Dist: psycopg[binary]<3.3,>=3.1.8
 Requires-Dist: pyparsing<3.3,>=3.1.0
-Requires-Dist: python-gnupg<=0.5.4,>=0.5
+Requires-Dist: python-gnupg<0.6,>=0.5.0
 Requires-Dist: PyYAML<6.1,>=5.1.1
 Requires-Dist: redis<6.5,>=4.3.0
 Requires-Dist: tablib<3.6,>=3.5.0

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.85.1"
+    version = "3.87.0"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.85.1"
+    version = "3.87.0"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/apps.py

@@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.85.1"
+    version = "3.87.0"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

pulpcore-3.87.0/pulpcore/app/management/commands/optimizemigration.py

@@ -0,0 +1,84 @@
+from collections import defaultdict
+from gettext import gettext as _
+
+from django.db import connection
+from django.db.migrations.loader import MigrationLoader
+from django.db.migrations.migration import SwappableTuple
+from django.db.migrations.optimizer import MigrationOptimizer
+from django.db.migrations.writer import MigrationWriter
+from django.conf import settings
+from django.core.management import BaseCommand
+
+
+def print_stats(migration):
+    operations = migration.operations
+    migration_types = defaultdict(int)
+    for operation in operations:
+        migration_types[operation.__class__.__name__] += 1
+    for key, value in migration_types.items():
+        print(f"{value: 4} {key}")
+    print("---")
+    print(_("Total: {count}").format(count=len(operations)))
+
+
+class Command(BaseCommand):
+    """
+    Django management command to optimize a migration.
+    """
+
+    help = _("Optimize a migration.")
+
+    def add_arguments(self, parser):
+        parser.add_argument("--dry-run", action="store_true", help=_("Don't change anything."))
+        parser.add_argument(
+            "--stat", action="store_true", help=_("Print statistics about operations.")
+        )
+        parser.add_argument("app-label", help=_("App label of the migrations to optimize."))
+        parser.add_argument("migration", help=_("Prefix of the migration to optimize."))
+
+    def handle(self, *args, **options):
+        dry_run = options.get("dry_run", False)
+        stat = options.get("stat", False)
+        app_label = options["app-label"]
+        migration_prefix = options["migration"]
+
+        loader = MigrationLoader(connection)
+
+        migration = loader.get_migration_by_prefix(app_label, migration_prefix)
+
+        print(_("Optimizing migration {}").format((migration.app_label, migration.name)))
+        if stat:
+            print(_("=== Old Migration Summary ==="))
+            print_stats(migration)
+
+        new_dependencies = []
+        for dependency in migration.dependencies:
+            if (
+                isinstance(dependency, SwappableTuple)
+                and settings.AUTH_USER_MODEL == dependency.setting
+            ):
+                new_dependencies.append(("__setting__", "AUTH_USER_MODEL"))
+            else:
+                new_dependencies.append(dependency)
+
+        optimizer = MigrationOptimizer()
+        new_operations = optimizer.optimize(migration.operations, app_label)
+
+        if new_operations != migration.operations:
+            print(
+                _("Changed from {old_count} to {new_count} operations.").format(
+                    old_count=len(migration.operations), new_count=len(new_operations)
+                )
+            )
+            if stat:
+                print(_("=== New Migration Summary ==="))
+                print_stats(migration)
+
+            migration.operations = new_operations
+            migration.dependencies = new_dependencies
+            if not dry_run:
+                writer = MigrationWriter(migration)
+                with open(writer.path, "w") as output_file:
+                    output_file.write(writer.as_string())
+        else:
+            print(_("No optimizations found."))

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/management/commands/remove-plugin.py

@@ -11,7 +11,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.management import BaseCommand, call_command, CommandError
 
 from pulpcore.app.apps import pulp_plugin_configs
-from pulpcore.app.models import AccessPolicy, ContentAppStatus, Worker
+from pulpcore.app.models import AccessPolicy, AppStatus
 from pulpcore.app.models.role import Role
 from pulpcore.app.util import get_view_urlpattern
 
@@ -53,10 +53,7 @@ class Command(BaseCommand):
             "Checking if Pulp services are running, it can take up to {}s...".format(waiting_time)
         )
         while is_pulp_running and (time.time() - check_started) < waiting_time:
-            is_pulp_running = (
-                ContentAppStatus.objects.online().exists()
-                or Worker.objects.online_workers().exists()
-            )
+            is_pulp_running = AppStatus.objects.online().exists()
             time.sleep(2)
 
         if is_pulp_running:

pulpcore-3.87.0/pulpcore/app/migrations/0139_task_app_lock.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.23 on 2025-08-07 11:43
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0138_vulnerabilityreport'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='app_lock',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tasks', to='core.appstatus'),
+        ),
+    ]

pulpcore-3.87.0/pulpcore/app/migrations/0140_require_appstatus_zdu.py

@@ -0,0 +1,15 @@
+# Generated by Django 4.2.23 on 2025-08-12 15:20
+
+from django.db import migrations
+from pulpcore.migrations import RequireVersion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0139_task_app_lock'),
+    ]
+
+    operations = [
+        RequireVersion("core", "3.85"),
+    ]

pulpcore-3.87.0/pulpcore/app/migrations/0141_alter_appstatus_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-08-27 10:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0140_require_appstatus_zdu'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appstatus',
+            name='name',
+            field=models.TextField(),
+        ),
+    ]

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/models/status.py

@@ -15,6 +15,7 @@ from pulpcore.app.models import BaseModel
 
 
 class AppStatusManager(models.Manager):
+    # This should be replaced with 3.87.
     def online(self):
         """
         Returns a queryset of objects that are online.
@@ -51,29 +52,32 @@ class AppStatusManager(models.Manager):
 
 class _AppStatusManager(AppStatusManager):
     # This is an intermediate class in order to allow a ZDU.
-    # It should be removed from the chain with 3.87.
+    # It should be made the real thing with 3.87.
+    def __init__(self):
+        super().__init__()
+        self._current_app_status = None
+
     def create(self, app_type, **kwargs):
-        if app_type == "api":
-            old_obj = ApiAppStatus.objects.create(**kwargs)
-        elif app_type == "worker":
-            from pulpcore.app.models import Worker
-
-            old_obj = Worker.objects.create(**kwargs)
-        else:
-            raise NotImplementedError(f"Invalid app_type: {app_type}")
+        if self._current_app_status is not None:
+            raise RuntimeError("There is already an app status in this process.")
+
         obj = super().create(app_type=app_type, **kwargs)
-        obj._old_status = old_obj
+        self._current_app_status = obj
         return obj
 
     async def acreate(self, app_type, **kwargs):
-        if app_type == "content":
-            old_obj = await ContentAppStatus.objects.acreate(**kwargs)
-        else:
-            raise NotImplementedError(f"Invalid app_type: {app_type}")
+        if self._current_app_status is not None:
+            raise RuntimeError("There is already an app status in this process.")
+
         obj = await super().acreate(app_type=app_type, **kwargs)
-        obj._old_status = old_obj
+        self._current_app_status = obj
         return obj
 
+    def current(self):
+        if self._current_app_status is None:
+            raise RuntimeError("There is no current app status.")
+        return self._current_app_status
+
     def online(self):
         """
         Returns a queryset of objects that are online.
@@ -107,7 +111,7 @@ class AppStatus(BaseModel):
     objects = _AppStatusManager()
 
     app_type = models.CharField(max_length=10, choices=APP_TYPES)
-    name = models.TextField(db_index=True, unique=True)
+    name = models.TextField()
     versions = HStoreField(default=dict)
     ttl = models.DurationField(null=False)
     last_heartbeat = models.DateTimeField(auto_now=True)
@@ -115,13 +119,6 @@ class AppStatus(BaseModel):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.ttl = timedelta(seconds=self._APP_TTL[self.app_type])
-        self._old_status = None
-
-    def delete(self, *args, **kwargs):
-        # adelete will call into this, so we should not replicate that one here.
-        if self._old_status is not None:
-            self._old_status.delete(*args, **kwargs)
-        super().delete(*args, **kwargs)
 
     @property
     def online(self) -> bool:
@@ -153,7 +150,6 @@ class AppStatus(BaseModel):
             ValueError: When the model instance has never been saved before. This method can
                 only update an existing database record.
         """
-        self._old_status.save_heartbeat()
         self.save(update_fields=["last_heartbeat"])
 
     async def asave_heartbeat(self):
@@ -166,7 +162,6 @@ class AppStatus(BaseModel):
             ValueError: When the model instance has never been saved before. This method can
                 only update an existing database record.
         """
-        await self._old_status.asave_heartbeat()
         await self.asave(update_fields=["last_heartbeat"])
 
     @property

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/models/task.py

@@ -116,7 +116,8 @@ class Task(BaseModel, AutoAddObjPermsMixin):
             Defaults to `True`.
 
     Relations:
-
+        app_lock (AppStatus): The app holding the lock on this task.
+            Warning: This is not yet implemented/enforced.
         parent (models.ForeignKey): Task that spawned this task (if any)
         worker (models.ForeignKey): The worker that this task is in
         pulp_domain (models.ForeignKey): The domain the Task is a part of
@@ -138,6 +139,10 @@ class Task(BaseModel, AutoAddObjPermsMixin):
     enc_kwargs = EncryptedJSONField(null=True, encoder=DjangoJSONEncoder)
 
     worker = models.ForeignKey("Worker", null=True, related_name="tasks", on_delete=models.SET_NULL)
+    # This field is supposed to replace the session advisory locks to protect tasks.
+    app_lock = models.ForeignKey(
+        "AppStatus", null=True, related_name="tasks", on_delete=models.SET_NULL
+    )
 
     parent_task = models.ForeignKey(
         "Task", null=True, related_name="child_tasks", on_delete=models.SET_NULL

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/serializers/status.py

@@ -2,11 +2,21 @@ from gettext import gettext as _
 
 from rest_framework import serializers
 
-from pulpcore.app.serializers.task import (
-    ApiAppStatusSerializer,
-    ContentAppStatusSerializer,
-    WorkerSerializer,
-)
+from pulpcore.app.models import AppStatus
+
+
+class AppStatusSerializer(serializers.ModelSerializer):
+    name = serializers.CharField(help_text=_("The name of the worker."), read_only=True)
+    last_heartbeat = serializers.DateTimeField(
+        help_text=_("Timestamp of the last time the worker talked to the service."), read_only=True
+    )
+    versions = serializers.HStoreField(
+        help_text=_("Versions of the components installed."), read_only=True
+    )
+
+    class Meta:
+        model = AppStatus
+        fields = ("name", "last_heartbeat", "versions")
 
 
 class VersionSerializer(serializers.Serializer):
@@ -88,7 +98,7 @@ class StatusSerializer(serializers.Serializer):
 
     versions = VersionSerializer(help_text=_("Version information of Pulp components"), many=True)
 
-    online_workers = WorkerSerializer(
+    online_workers = AppStatusSerializer(
         help_text=_(
             "List of online workers known to the application. An online worker is actively "
             "heartbeating and can respond to new work."
@@ -96,7 +106,7 @@ class StatusSerializer(serializers.Serializer):
         many=True,
     )
 
-    online_api_apps = ApiAppStatusSerializer(
+    online_api_apps = AppStatusSerializer(
         help_text=_(
             "List of online api apps known to the application. An online api app "
             "is actively heartbeating and can serve the rest api to clients."
@@ -104,7 +114,7 @@ class StatusSerializer(serializers.Serializer):
         many=True,
     )
 
-    online_content_apps = ContentAppStatusSerializer(
+    online_content_apps = AppStatusSerializer(
         help_text=_(
             "List of online content apps known to the application. An online content app "
             "is actively heartbeating and can serve data to clients."

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/serializers/task.py

@@ -198,34 +198,6 @@ class TaskCancelSerializer(serializers.Serializer):
         fields = ("state",)
 
 
-class ApiAppStatusSerializer(ModelSerializer):
-    name = serializers.CharField(help_text=_("The name of the worker."), read_only=True)
-    last_heartbeat = serializers.DateTimeField(
-        help_text=_("Timestamp of the last time the worker talked to the service."), read_only=True
-    )
-    versions = serializers.HStoreField(
-        help_text=_("Versions of the components installed."), read_only=True
-    )
-
-    class Meta:
-        model = models.ApiAppStatus
-        fields = ("name", "last_heartbeat", "versions")
-
-
-class ContentAppStatusSerializer(ModelSerializer):
-    name = serializers.CharField(help_text=_("The name of the worker."), read_only=True)
-    last_heartbeat = serializers.DateTimeField(
-        help_text=_("Timestamp of the last time the worker talked to the service."), read_only=True
-    )
-    versions = serializers.HStoreField(
-        help_text=_("Versions of the components installed."), read_only=True
-    )
-
-    class Meta:
-        model = models.ContentAppStatus
-        fields = ("name", "last_heartbeat", "versions")
-
-
 class WorkerSerializer(ModelSerializer):
     pulp_href = IdentityField(view_name="workers-detail")
 
@@ -246,7 +218,7 @@ class WorkerSerializer(ModelSerializer):
     )
 
     class Meta:
-        model = models.Worker
+        model = models.AppStatus
         fields = ModelSerializer.Meta.fields + (
             "name",
             "last_heartbeat",

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/settings.py

@@ -405,6 +405,7 @@ KAFKA_SASL_PASSWORD = None
 
 # opentelemetry settings
 OTEL_ENABLED = False
+OTEL_PULP_API_HISTOGRAM_BUCKETS = []
 
 # VulnerabilityReport settings
 VULN_REPORT_TASK_LIMITER = 10
@@ -504,6 +505,16 @@ authentication_json_header_openapi_security_scheme_validator = Validator(
     messages={"is_type_of": "{name} must be a dictionary."},
 )
 
+otel_pulp_api_histogram_buckets_validator = Validator(
+    "OTEL_PULP_API_HISTOGRAM_BUCKETS",
+    is_type_of=list,
+    condition=lambda v: all([isinstance(value, float) for value in v]),
+    messages={
+        "is_type_of": "{name} must be a list.",
+        "condition": "All buckets must be declared as a float value",
+    },
+)
+
 
 def otel_middleware_hook(settings):
     data = {"dynaconf_merge": True}
@@ -530,6 +541,7 @@ settings = DjangoDynaconf(
         unknown_algs_validator,
         json_header_auth_validator,
         authentication_json_header_openapi_security_scheme_validator,
+        otel_pulp_api_histogram_buckets_validator,
     ],
     post_hooks=(otel_middleware_hook,),
 )

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/tasks/analytics.py

@@ -19,8 +19,7 @@ from google.protobuf.json_format import MessageToJson
 from pulpcore.app.apps import pulp_plugin_configs
 from pulpcore.app.models import SystemID, Group, Domain, AccessPolicy
 from pulpcore.app.models.role import Role
-from pulpcore.app.models.status import ContentAppStatus
-from pulpcore.app.models.task import Worker
+from pulpcore.app.models.status import AppStatus
 from pulpcore.app.protobuf.analytics_pb2 import Analytics
 
 
@@ -79,13 +78,13 @@ async def _versions_data(analytics):
 
 
 async def _online_content_apps_data(analytics):
-    online_content_apps_qs = ContentAppStatus.objects.online()
+    online_content_apps_qs = AppStatus.objects.online().filter(app_type="content")
     analytics.online_content_apps.processes = await online_content_apps_qs.acount()
     analytics.online_content_apps.hosts = await _num_hosts(online_content_apps_qs)
 
 
 async def _online_workers_data(analytics):
-    online_workers_qs = Worker.objects.online()
+    online_workers_qs = AppStatus.objects.online().filter(app_type="worker")
     analytics.online_workers.processes = await online_workers_qs.acount()
     analytics.online_workers.hosts = await _num_hosts(online_workers_qs)
 

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/tasks/importer.py

@@ -18,6 +18,7 @@ from tablib import Dataset
 from pulpcore.exceptions.plugin import MissingPlugin
 from pulpcore.app.apps import get_plugin_config
 from pulpcore.app.models import (
+    AppStatus,
     Artifact,
     Content,
     CreatedResource,
@@ -28,7 +29,6 @@ from pulpcore.app.models import (
     Repository,
     Task,
     TaskGroup,
-    Worker,
 )
 from pulpcore.app.modelresource import (
     ArtifactResource,
@@ -508,7 +508,7 @@ def pulp_import(importer_pk, path, toc, create_repositories):
         # By default (setting is not-set), import will continue to use 100% of the available
         # workers.
         import_workers_percent = int(settings.get("IMPORT_WORKERS_PERCENT", 100))
-        total_workers = Worker.objects.online().count()
+        total_workers = AppStatus.objects.online().filter(app_type="worker").count()
         import_workers = max(1, int(total_workers * (import_workers_percent / 100.0)))
 
         with open(os.path.join(temp_dir, REPO_FILE), "r") as repo_data_file:

{pulpcore-3.85.1 → pulpcore-3.87.0}/pulpcore/app/views/status.py

@@ -11,8 +11,7 @@ from collections import namedtuple
 
 from pulpcore.app.apps import pulp_plugin_configs
 from pulpcore.app.models.content import Artifact
-from pulpcore.app.models.status import ApiAppStatus, ContentAppStatus
-from pulpcore.app.models.task import Worker
+from pulpcore.app.models.status import AppStatus
 from pulpcore.app.serializers.status import StatusSerializer
 from pulpcore.app.redis_connection import get_redis_connection
 from pulpcore.app.util import get_domain
@@ -79,9 +78,9 @@ class StatusView(APIView):
 
         db_status = {"connected": self._get_db_conn_status()}
 
-        online_workers = Worker.objects.online()
-        online_api_apps = ApiAppStatus.objects.online()
-        online_content_apps = ContentAppStatus.objects.online()
+        online_workers = AppStatus.objects.online().filter(app_type="worker")
+        online_api_apps = AppStatus.objects.online().filter(app_type="api")
+        online_content_apps = AppStatus.objects.online().filter(app_type="content")
 
         content_settings = {
             "content_origin": settings.CONTENT_ORIGIN,
@@ -113,7 +112,7 @@ class StatusView(APIView):
             bool: True if there's a db connection. False otherwise.
         """
         try:
-            Worker.objects.count()
+            AppStatus.objects.count()
         except Exception:
             _logger.exception(_("Cannot connect to database during status check."))
             return False