1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496
|
from contextlib import contextmanager
from unittest.mock import MagicMock, Mock, patch
import pytest
from celery.concurrency.thread import TaskPool as ThreadTaskPool
from celery.fixups.django import DjangoFixup, DjangoWorkerFixup, FixupWarning, _maybe_close_fd, fixup
from t.unit import conftest
class FixupCase:
Fixup = None
@contextmanager
def fixup_context(self, app, **kwargs):
with patch('celery.fixups.django.DjangoWorkerFixup.validate_models'):
with patch('celery.fixups.django.symbol_by_name') as symbyname:
with patch('celery.fixups.django.import_module') as impmod:
worker = Mock()
worker.pool_cls = Mock(__module__='celery.concurrency.prefork')
f = self.Fixup(app, **kwargs)
f.worker = worker
yield f, impmod, symbyname
class test_DjangoFixup(FixupCase):
Fixup = DjangoFixup
def test_setting_default_app(self):
from celery import _state
prev, _state.default_app = _state.default_app, None
try:
app = Mock(name='app')
DjangoFixup(app)
app.set_default.assert_called_with()
finally:
_state.default_app = prev
@patch('celery.fixups.django.DjangoWorkerFixup')
def test_worker_fixup_property(self, DjangoWorkerFixup):
f = DjangoFixup(self.app)
f._worker_fixup = None
assert f.worker_fixup is DjangoWorkerFixup()
assert f.worker_fixup is DjangoWorkerFixup()
def test_on_import_modules(self):
f = DjangoFixup(self.app)
f.worker_fixup = Mock(name='worker_fixup')
f.on_import_modules()
f.worker_fixup.validate_models.assert_called_with()
def test_autodiscover_tasks(self, patching):
patching.modules('django.apps')
from django.apps import apps
f = DjangoFixup(self.app)
configs = [Mock(name='c1'), Mock(name='c2')]
apps.get_app_configs.return_value = configs
assert f.autodiscover_tasks() == [c.name for c in configs]
@pytest.mark.masked_modules('django')
def test_fixup_no_django(self, patching, mask_modules):
with patch('celery.fixups.django.DjangoFixup') as Fixup:
patching.setenv('DJANGO_SETTINGS_MODULE', '')
fixup(self.app)
Fixup.assert_not_called()
patching.setenv('DJANGO_SETTINGS_MODULE', 'settings')
with pytest.warns(FixupWarning):
fixup(self.app)
Fixup.assert_not_called()
def test_fixup(self, patching):
with patch('celery.fixups.django.DjangoFixup') as Fixup:
patching.setenv('DJANGO_SETTINGS_MODULE', '')
fixup(self.app)
Fixup.assert_not_called()
patching.setenv('DJANGO_SETTINGS_MODULE', 'settings')
with conftest.module_exists('django'):
import django
django.VERSION = (1, 11, 1)
fixup(self.app)
Fixup.assert_called()
def test_maybe_close_fd(self):
with patch('os.close'):
_maybe_close_fd(Mock())
_maybe_close_fd(object())
def test_init(self):
with self.fixup_context(self.app) as (f, importmod, sym):
assert f
@pytest.mark.patched_module(
'django',
'django.db',
'django.db.transaction',
)
def test_install(self, patching, module):
self.app.loader = Mock()
self.cw = patching('os.getcwd')
self.p = patching('sys.path')
self.sigs = patching('celery.fixups.django.signals')
with self.fixup_context(self.app) as (f, _, _):
self.cw.return_value = '/opt/vandelay'
f.install()
self.sigs.worker_init.connect.assert_called_with(f.on_worker_init)
assert self.app.loader.now == f.now
# Specialized DjangoTask class is used
assert self.app.task_cls == 'celery.contrib.django.task:DjangoTask'
from celery.contrib.django.task import DjangoTask
assert issubclass(f.app.Task, DjangoTask)
assert hasattr(f.app.Task, 'delay_on_commit')
assert hasattr(f.app.Task, 'apply_async_on_commit')
self.p.insert.assert_called_with(0, '/opt/vandelay')
def test_install_custom_user_task(self, patching):
patching('celery.fixups.django.signals')
self.app.task_cls = 'myapp.celery.tasks:Task'
self.app._custom_task_cls_used = True
with self.fixup_context(self.app) as (f, _, _):
f.install()
# Specialized DjangoTask class is NOT used,
# The one from the user's class is
assert self.app.task_cls == 'myapp.celery.tasks:Task'
def test_install_custom_user_task_as_class_attribute(self, patching):
patching('celery.fixups.django.signals')
from celery.app import Celery
class MyCeleryApp(Celery):
task_cls = 'myapp.celery.tasks:Task'
app = MyCeleryApp('mytestapp')
with self.fixup_context(app) as (f, _, _):
f.install()
# Specialized DjangoTask class is NOT used,
# The one from the user's class is
assert app.task_cls == 'myapp.celery.tasks:Task'
def test_now(self):
with self.fixup_context(self.app) as (f, _, _):
assert f.now(utc=True)
f._now.assert_not_called()
assert f.now(utc=False)
f._now.assert_called()
def test_on_worker_init(self):
with self.fixup_context(self.app) as (f, _, _):
with patch('celery.fixups.django.DjangoWorkerFixup') as DWF:
mock_worker = Mock(name="worker")
f.on_worker_init(sender=mock_worker)
assert DWF.return_value.worker == mock_worker
DWF.assert_called_with(f.app)
DWF.return_value.install.assert_called_with()
assert f._worker_fixup is DWF.return_value
def test_on_worker_init_warns_without_sender(self):
with self.fixup_context(self.app) as (f, _, _):
with patch("celery.fixups.django.DjangoWorkerFixup"):
with pytest.warns(FixupWarning, match="called without a sender"):
f.on_worker_init(sender=None)
class InterfaceError(Exception):
pass
class test_DjangoWorkerFixup(FixupCase):
Fixup = DjangoWorkerFixup
def test_init(self):
with self.fixup_context(self.app) as (f, importmod, sym):
assert f
def test_install(self):
self.app.conf = {'CELERY_DB_REUSE_MAX': None}
self.app.loader = Mock()
with self.fixup_context(self.app) as (f, _, _):
with patch('celery.fixups.django.signals') as sigs:
f.install()
sigs.beat_embedded_init.connect.assert_called_with(
f.close_database,
)
sigs.task_prerun.connect.assert_called_with(f.on_task_prerun)
sigs.task_postrun.connect.assert_called_with(f.on_task_postrun)
sigs.worker_process_init.connect.assert_called_with(
f.on_worker_process_init,
)
def test_on_worker_process_init(self, patching):
with self.fixup_context(self.app) as (f, _, _):
with patch('celery.fixups.django._maybe_close_fd', side_effect=InterfaceError) as mcf:
_all = f._db.connections.all = Mock()
conns = _all.return_value = [
Mock(), MagicMock(),
]
conns[0].connection = None
with patch.object(f, 'close_cache'):
with patch.object(f, '_close_database'):
f.interface_errors = (InterfaceError, )
f.on_worker_process_init()
mcf.assert_called_with(conns[1].connection)
f.close_cache.assert_called_with()
f._close_database.assert_called_with()
f.validate_models = Mock(name='validate_models')
patching.setenv('FORKED_BY_MULTIPROCESSING', '1')
f.on_worker_process_init()
f.validate_models.assert_called_with()
def test_on_task_prerun(self):
task = Mock()
with self.fixup_context(self.app) as (f, _, _):
task.request.is_eager = False
with patch.object(f, 'close_database'):
f.on_task_prerun(task)
f.close_database.assert_called_with()
task.request.is_eager = True
with patch.object(f, 'close_database'):
f.on_task_prerun(task)
f.close_database.assert_not_called()
def test_on_task_postrun(self):
task = Mock()
with self.fixup_context(self.app) as (f, _, _):
with patch.object(f, 'close_cache'):
task.request.is_eager = False
with patch.object(f, 'close_database'):
f.on_task_postrun(task)
f.close_database.assert_called()
f.close_cache.assert_called()
# when a task is eager, don't close connections
with patch.object(f, 'close_cache'):
task.request.is_eager = True
with patch.object(f, 'close_database'):
f.on_task_postrun(task)
f.close_database.assert_not_called()
f.close_cache.assert_not_called()
def test_close_database(self):
with self.fixup_context(self.app) as (f, _, _):
with patch.object(f, '_close_database') as _close:
f.db_reuse_max = None
f.close_database()
_close.assert_called_with()
_close.reset_mock()
f.db_reuse_max = 10
f._db_recycles = 3
f.close_database()
_close.assert_not_called()
assert f._db_recycles == 4
_close.reset_mock()
f._db_recycles = 20
f.close_database()
_close.assert_called_with()
assert f._db_recycles == 1
def test__close_database(self):
with self.fixup_context(self.app) as (f, _, _):
conns = [Mock(), Mock(), Mock()]
conns[1].close.side_effect = KeyError('already closed')
f.DatabaseError = KeyError
f.interface_errors = ()
f._db.connections = Mock() # ConnectionHandler
f._db.connections.all.side_effect = lambda initialized_only: conns
f._close_database()
conns[0].close.assert_called_with()
conns[1].close.assert_called_with()
conns[2].close.assert_called_with()
conns[1].close.side_effect = KeyError(
'omg')
with pytest.raises(KeyError):
f._close_database()
def test__close_database_django_pre_41(self):
"""Test that Django < 4.1 (without initialized_only parameter) is handled."""
with self.fixup_context(self.app) as (f, _, _):
conns = [Mock(), Mock()]
f.DatabaseError = KeyError
f.interface_errors = ()
# Mock Django < 4.1 behavior: connections.all() doesn't accept initialized_only
f._db.connections = Mock()
def all_without_initialized_only(**kwargs):
if 'initialized_only' in kwargs:
raise TypeError("all() got an unexpected keyword argument 'initialized_only'")
return conns
f._db.connections.all = Mock(side_effect=all_without_initialized_only)
# Should fall back to calling all() without initialized_only
f._close_database()
# Verify it was called twice: first with initialized_only (raises), then without
assert f._db.connections.all.call_count == 2
# First call with initialized_only=True
f._db.connections.all.assert_any_call(initialized_only=True)
# Second call without arguments (fallback)
f._db.connections.all.assert_any_call()
# Verify connections were closed
conns[0].close.assert_called_with()
conns[1].close.assert_called_with()
def test_close_database_always_closes_connections(self):
with self.fixup_context(self.app) as (f, _, _):
conn = Mock()
f._db.connections.all = Mock(return_value=[conn])
f.close_database()
conn.close.assert_called_once_with()
# close_if_unusable_or_obsolete is not safe to call in all conditions, so avoid using
# it to optimize connection handling.
conn.close_if_unusable_or_obsolete.assert_not_called()
def test_close_database_skip_conn_pool(self):
class Connection:
"""Mock connection without `close_pool` method."""
alias = 'default'
def close(self):
pass
with self.fixup_context(self.app) as (f, _, _):
conn = Mock(spec=Connection)
f._db.connections.all = Mock(return_value=[conn])
f.close_database()
assert not hasattr(conn, "close_pool")
conn.close.assert_called_once_with()
def test_close_database_suppresses_close_pool_keyerror(self):
with self.fixup_context(self.app) as (f, _, _):
conn = Mock()
conn.close_pool = Mock(side_effect=KeyError("pool already closed"))
f._db.connections.all = Mock(return_value=[conn])
f.close_database() # should not raise
conn.close.assert_called_once_with()
conn.close_pool.assert_called_once_with()
def test_close_database_conn_pool_based_on_settings(self):
class DJSettings:
DATABASES = {}
with self.fixup_context(self.app) as (f, _, _):
conn = Mock()
conn.alias = "default"
conn.close_pool = Mock()
f._db.connections.all = Mock(return_value=[conn])
f._settings = DJSettings
f._settings.DATABASES["default"] = {"OPTIONS": {}}
f.close_database()
conn.close.assert_called_once_with()
conn.close_pool.assert_not_called()
conn.reset_mock()
f._settings.DATABASES["default"] = {"OPTIONS": {"pool": True}}
f.close_database()
conn.close.assert_called_once_with()
conn.close_pool.assert_called_once_with()
conn.reset_mock()
f._settings.DATABASES["default"] = {"OPTIONS": {"pool": False}}
f.close_database()
conn.close.assert_called_once_with()
conn.close_pool.assert_not_called()
def test_close_database_conn_pool_thread_pool(self):
class DJSettings:
DATABASES = {}
with self.fixup_context(self.app) as (f, _, _):
conn = Mock()
conn.alias = "default"
conn.close_pool = Mock()
f._db.connections.all = Mock(return_value=[conn])
f._settings = DJSettings
f._settings.DATABASES["default"] = {"OPTIONS": {"pool": True}}
f.close_database()
conn.close.assert_called_once_with()
conn.close_pool.assert_called_once_with()
conn.reset_mock()
f.worker.pool_cls = ThreadTaskPool
assert "prefork" not in ThreadTaskPool.__module__
f.close_database()
conn.close.assert_called_once_with()
conn.close_pool.assert_not_called()
def test_close_cache_raises_error(self):
with self.fixup_context(self.app) as (f, _, _):
f._cache.close_caches.side_effect = AttributeError
f.close_cache()
def test_close_cache(self):
with self.fixup_context(self.app) as (f, _, _):
f.close_cache()
f._cache.close_caches.assert_called_with()
@pytest.mark.patched_module('django', 'django.db', 'django.core',
'django.core.cache', 'django.conf',
'django.db.utils')
def test_validate_models(self, patching, module):
f = self.Fixup(self.app)
f.django_setup = Mock(name='django.setup')
patching.modules('django.core.checks')
from django.core.checks import run_checks
f.validate_models()
f.django_setup.assert_called_with()
run_checks.assert_called_with()
# test --skip-checks flag
f.django_setup.reset_mock()
run_checks.reset_mock()
patching.setenv('CELERY_SKIP_CHECKS', 'true')
f.validate_models()
f.django_setup.assert_called_with()
run_checks.assert_not_called()
def test_django_setup(self, patching):
patching('celery.fixups.django.symbol_by_name')
patching('celery.fixups.django.import_module')
django, = patching.modules('django')
f = self.Fixup(self.app)
f.django_setup()
django.setup.assert_called_with()
def test__is_prefork(self):
with self.fixup_context(self.app) as (f, _, _):
f.worker.pool_cls = Mock(__module__='celery.concurrency.prefork')
assert f._is_prefork()
f.worker.pool_cls = "prefork"
assert f._is_prefork()
f.worker.pool_cls = Mock(__module__='celery.concurrency.thread')
assert not f._is_prefork()
f.worker = None
assert not f._is_prefork()
def test_no_recursive_worker_instantiation(self, patching):
"""Regression test: DjangoWorkerFixup must not create a WorkController in __init__.
Historically, DjangoWorkerFixup.__init__ instantiated a WorkController when
called with worker=None, which could cause recursive instantiation when
invoked from worker lifecycle signals.
This test verifies the fixed behavior:
- DjangoWorkerFixup(app, worker=None) must not create a WorkController
- It should instead leave self.worker unset and rely on on_worker_init
to attach the actual worker instance later
"""
from celery.worker import WorkController
patching('celery.fixups.django.symbol_by_name')
patching('celery.fixups.django.import_module')
patching.modules('django', 'django.db', 'django.core.checks')
# Track WorkController instantiations
instantiation_count = {'count': 0}
original_init = WorkController.__init__
def tracking_init(self_worker, *args, **kwargs):
instantiation_count['count'] += 1
return original_init(self_worker, *args, **kwargs)
with patch.object(WorkController, '__init__', tracking_init):
# Creating DjangoWorkerFixup without a worker argument
# should NOT create a WorkController instance
DjangoWorkerFixup(self.app)
# EXPECTED: 0 WorkController instances created
assert instantiation_count['count'] == 0, (
f"DjangoWorkerFixup(app) should NOT create a WorkController, "
f"but {instantiation_count['count']} instance(s) were created. "
f"This is the root cause of the recursion bug."
)
|