pulpcore 3.118.2__tar.gz → 3.118.3__tar.gz

{pulpcore-3.118.2 → pulpcore-3.118.3}/CHANGES.md

@@ -8,6 +8,26 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.118.3 (2026-10-15) {: #3.118.3 }
+
+### REST API {: #3.118.3-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.118.3-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.118.3-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.118.3-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.118.2 (2026-10-13) {: #3.118.2 }
 
 ### REST API {: #3.118.2-rest-api }

{pulpcore-3.118.2 → pulpcore-3.118.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.118.2
+Version: 3.118.3
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 License-Expression: GPL-2.0-or-later

{pulpcore-3.118.2 → pulpcore-3.118.3}/pulp_certguard/app/__init__.py

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

{pulpcore-3.118.2 → pulpcore-3.118.3}/pulp_file/app/__init__.py

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

{pulpcore-3.118.2 → pulpcore-3.118.3}/pulpcore/app/apps.py

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

{pulpcore-3.118.2 → pulpcore-3.118.3}/pulpcore/content/__init__.py

@@ -58,18 +58,18 @@ async def _heartbeat():
     msg = "Content App '{name}' heartbeat written, sleeping for '{interarrival}' seconds".format(
         name=name, interarrival=heartbeat_interval
     )
-    fail_msg = ("Content App '{name}' failed to write a heartbeat to the database.").format(
-        name=name
-    )
+    fail_msg = f"Content App '{name}' failed to register or write a heartbeat to the database."
     versions = {app.label: app.version for app in pulp_plugin_configs()}
-
     try:
         app_status = await AppStatus.objects.acreate(
             name=name, app_type="content", versions=versions
         )
     except IntegrityError:
         log.error(f"A content app with name {name} already exists in the database.")
-        exit(Arbiter.WORKER_BOOT_ERROR)
+        os._exit(Arbiter.WORKER_BOOT_ERROR)
+    except (InterfaceError, DatabaseError) as e:
+        log.error(f"Content App '{name}' failed to register with the database. Exception: {str(e)}")
+        os._exit(Arbiter.WORKER_BOOT_ERROR)
     try:
         while True:
             await asyncio.sleep(heartbeat_interval)
@@ -83,7 +83,7 @@ async def _heartbeat():
                     log.debug(msg)
                 except (InterfaceError, DatabaseError) as e:
                     log.error(f"{fail_msg} Exception: {str(e)}")
-                    exit(Arbiter.WORKER_BOOT_ERROR)
+                    os._exit(Arbiter.WORKER_BOOT_ERROR)
     finally:
         if app_status:
             await app_status.adelete()

pulpcore-3.118.3/pulpcore/tests/unit/content/test_heartbeat.py

@@ -0,0 +1,55 @@
+from unittest.mock import AsyncMock, Mock
+
+import pytest
+from django.db.utils import IntegrityError, InterfaceError, OperationalError
+from gunicorn.arbiter import Arbiter
+
+from pulpcore.app.models.status import AppStatus, AppStatusManager
+from pulpcore.content import _heartbeat
+from pulpcore.content.handler import Handler
+
+
+class MockException(Exception):
+    pass
+
+
+@pytest.mark.parametrize("error_class", [InterfaceError, OperationalError])
+@pytest.mark.asyncio
+async def test_exits_on_heartbeat_database_failure(monkeypatch, settings, error_class):
+    mock_app_status = AsyncMock()
+    mock_app_status.asave_heartbeat.side_effect = [error_class(), error_class()]
+    mock_acreate = AsyncMock()
+    mock_acreate.return_value = mock_app_status
+    monkeypatch.setattr(AppStatusManager, "acreate", mock_acreate)
+    monkeypatch.setattr(AppStatus, "objects", AppStatusManager())
+    mock_reset_db = Mock()
+    monkeypatch.setattr(Handler, "_reset_db_connection", mock_reset_db)
+    mock_exit = Mock(side_effect=SystemExit(Arbiter.WORKER_BOOT_ERROR))
+    monkeypatch.setattr("pulpcore.content.os._exit", mock_exit)
+    settings.CONTENT_APP_TTL = 1
+    monkeypatch.setattr("pulpcore.content.asyncio.sleep", AsyncMock(return_value=None))
+
+    with pytest.raises(SystemExit) as exc:
+        await _heartbeat()
+
+    assert exc.value.code == Arbiter.WORKER_BOOT_ERROR
+    assert mock_app_status.asave_heartbeat.await_count == 2
+    mock_reset_db.assert_called_once_with()
+    mock_exit.assert_called_once_with(Arbiter.WORKER_BOOT_ERROR)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("error_class", [IntegrityError, OperationalError])
+async def test_exits_on_initial_registration_database_failure(monkeypatch, settings, error_class):
+    mock_acreate = AsyncMock(side_effect=error_class())
+    monkeypatch.setattr(AppStatusManager, "acreate", mock_acreate)
+    monkeypatch.setattr(AppStatus, "objects", AppStatusManager())
+    mock_exit = Mock(side_effect=SystemExit(Arbiter.WORKER_BOOT_ERROR))
+    monkeypatch.setattr("pulpcore.content.os._exit", mock_exit)
+
+    with pytest.raises(SystemExit) as exc:
+        await _heartbeat()
+
+    assert exc.value.code == Arbiter.WORKER_BOOT_ERROR
+    mock_exit.assert_called_once_with(Arbiter.WORKER_BOOT_ERROR)
+    assert mock_acreate.await_count == 1

{pulpcore-3.118.2 → pulpcore-3.118.3}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.118.2
+Version: 3.118.3
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 License-Expression: GPL-2.0-or-later

{pulpcore-3.118.2 → pulpcore-3.118.3}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.118.2"
+version = "3.118.3"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -207,7 +207,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.118.2"
+current_version = "3.118.3"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"

pulpcore-3.118.2/pulpcore/tests/unit/content/test_heartbeat.py

@@ -1,37 +0,0 @@
-from unittest.mock import AsyncMock, Mock, call
-
-import pytest
-from django.db.utils import InterfaceError, OperationalError
-
-from pulpcore.app.models.status import AppStatus, AppStatusManager
-from pulpcore.content import _heartbeat
-from pulpcore.content.handler import Handler
-
-
-class MockException(Exception):
-    pass
-
-
-@pytest.mark.parametrize("error_class", [InterfaceError, OperationalError])
-@pytest.mark.asyncio
-async def test_db_connection_interface_error(monkeypatch, settings, error_class):
-    """
-    Test that if an InterfaceError or OperationalError is raised,
-    Handler._reset_db_connection() is called
-    """
-
-    mock_app_status = AsyncMock()
-    mock_app_status.asave_heartbeat.side_effect = [error_class(), error_class()]
-    mock_acreate = AsyncMock()
-    mock_acreate.return_value = mock_app_status
-    monkeypatch.setattr(AppStatusManager, "acreate", mock_acreate)
-    monkeypatch.setattr(AppStatus, "objects", AppStatusManager())
-    mock_reset_db = Mock()
-    monkeypatch.setattr(Handler, "_reset_db_connection", mock_reset_db)
-    settings.CONTENT_APP_TTL = 1
-
-    with pytest.raises(SystemExit):
-        await _heartbeat()
-
-    mock_app_status.asave_heartbeat.assert_called()
-    mock_reset_db.assert_has_calls([call()])