python/python-celery
SHA256
15
0
Fork 0
forked from pool/python-celery
Code Pull Requests Activity

- add 879af6341974c3778077d8212d78f093b2d77a4f.patch

Browse Source 
b260860988469ef8ad74f2d4225839c2fa91d590.patch: better
  compatibility with newer billiard

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-celery?expand=0&rev=149
This commit is contained in:
Dirk Mueller
2023-03-28 09:19:23 +00:00
committed by Git OBS Bridge
parent a40db673a6
commit 7be4a28d11
4 changed files with 195 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
879af6341974c3778077d8212d78f093b2d77a4f.patch Normal file
View File

@@ -0,0 +1,141 @@
From 879af6341974c3778077d8212d78f093b2d77a4f Mon Sep 17 00:00:00 2001
From: Tomer Nosrati <tomer.nosrati@kcg.tech>
Date: Tue, 4 Oct 2022 02:06:50 +0300
Subject: [PATCH] Fixed error handling bugs due to upgrade to a newer version
of billiard
---
celery/app/task.py | 4 +++-
celery/worker/request.py | 19 ++++++++++++++-----
t/unit/utils/test_collections.py | 4 ++--
t/unit/worker/test_request.py | 8 ++++----
4 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/celery/app/task.py b/celery/app/task.py
index 212bc772e0..d6108fbef8 100644
--- a/celery/app/task.py
+++ b/celery/app/task.py
@@ -1,7 +1,7 @@
"""Task implementation: request context and the task base class."""
import sys
-from billiard.einfo import ExceptionInfo
+from billiard.einfo import ExceptionInfo, ExceptionWithTraceback
from kombu import serialization
from kombu.exceptions import OperationalError
from kombu.utils.uuid import uuid
@@ -813,6 +813,8 @@ def apply(self, args=None, kwargs=None,
retval = ret.retval
if isinstance(retval, ExceptionInfo):
retval, tb = retval.exception, retval.traceback
+ if isinstance(retval, ExceptionWithTraceback):
+ retval = retval.exc
if isinstance(retval, Retry) and retval.sig is not None:
return retval.sig.apply(retries=retries + 1)
state = states.SUCCESS if ret.info is None else ret.info.state
diff --git a/celery/worker/request.py b/celery/worker/request.py
index d89971468c..d0004a19cc 100644
--- a/celery/worker/request.py
+++ b/celery/worker/request.py
@@ -10,6 +10,7 @@
from weakref import ref
from billiard.common import TERM_SIGNAME
+from billiard.einfo import ExceptionWithTraceback
from kombu.utils.encoding import safe_repr, safe_str
from kombu.utils.objects import cached_property
@@ -511,8 +512,11 @@ def on_success(self, failed__retval__runtime, **kwargs):
"""Handler called if the task was successfully processed."""
failed, retval, runtime = failed__retval__runtime
if failed:
- if isinstance(retval.exception, (SystemExit, KeyboardInterrupt)):
- raise retval.exception
+ exc = retval.exception
+ if isinstance(exc, ExceptionWithTraceback):
+ exc = exc.exc
+ if isinstance(exc, (SystemExit, KeyboardInterrupt)):
+ raise exc
return self.on_failure(retval, return_ok=True)
task_ready(self, successful=True)
@@ -535,6 +539,9 @@ def on_failure(self, exc_info, send_failed_event=True, return_ok=False):
task_ready(self)
exc = exc_info.exception
+ if isinstance(exc, ExceptionWithTraceback):
+ exc = exc.exc
+
is_terminated = isinstance(exc, Terminated)
if is_terminated:
# If the task was terminated and the task was not cancelled due
@@ -735,9 +742,11 @@ def execute_using_pool(self, pool, **kwargs):
def on_success(self, failed__retval__runtime, **kwargs):
failed, retval, runtime = failed__retval__runtime
if failed:
- if isinstance(retval.exception, (
- SystemExit, KeyboardInterrupt)):
- raise retval.exception
+ exc = retval.exception
+ if isinstance(exc, ExceptionWithTraceback):
+ exc = exc.exc
+ if isinstance(exc, (SystemExit, KeyboardInterrupt)):
+ raise exc
return self.on_failure(retval, return_ok=True)
task_ready(self)
diff --git a/t/unit/utils/test_collections.py b/t/unit/utils/test_collections.py
index ce776cebf1..aae685ebc7 100644
--- a/t/unit/utils/test_collections.py
+++ b/t/unit/utils/test_collections.py
@@ -145,8 +145,8 @@ def test_exception_info(self):
except Exception:
einfo = ExceptionInfo()
assert str(einfo) == einfo.traceback
- assert isinstance(einfo.exception, LookupError)
- assert einfo.exception.args == ('The quick brown fox jumps...',)
+ assert isinstance(einfo.exception.exc, LookupError)
+ assert einfo.exception.exc.args == ('The quick brown fox jumps...',)
assert einfo.traceback
assert repr(einfo)
diff --git a/t/unit/worker/test_request.py b/t/unit/worker/test_request.py
index a34f70dc80..b818f2837c 100644
--- a/t/unit/worker/test_request.py
+++ b/t/unit/worker/test_request.py
@@ -155,7 +155,7 @@ def test_execute_jail_failure(self):
self.app, uuid(), self.mytask_raising.name, {}, [4], {},
)
assert isinstance(ret, ExceptionInfo)
- assert ret.exception.args == (4,)
+ assert ret.exception.exc.args == (4,)
def test_execute_task_ignore_result(self):
@self.app.task(shared=False, ignore_result=True)
@@ -385,7 +385,7 @@ def test_on_failure_WorkerLostError_redelivered_True(self):
task_failure,
sender=req.task,
task_id=req.id,
- exception=einfo.exception,
+ exception=einfo.exception.exc,
args=req.args,
kwargs=req.kwargs,
traceback=einfo.traceback,
@@ -394,7 +394,7 @@ def test_on_failure_WorkerLostError_redelivered_True(self):
req.on_failure(einfo)
req.task.backend.mark_as_failure.assert_called_once_with(req.id,
- einfo.exception,
+ einfo.exception.exc,
request=req._context,
store_result=True)
@@ -807,7 +807,7 @@ def test_from_message_invalid_kwargs(self):
m = self.TaskMessage(self.mytask.name, args=(), kwargs='foo')
req = Request(m, app=self.app)
with pytest.raises(InvalidTaskError):
- raise req.execute().exception
+ raise req.execute().exception.exc
def test_on_hard_timeout_acks_late(self, patching):
error = patching('celery.worker.request.error')

34
b260860988469ef8ad74f2d4225839c2fa91d590.patch Normal file
View File

@@ -0,0 +1,34 @@
From b260860988469ef8ad74f2d4225839c2fa91d590 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.katz@kcg.tech>
Date: Sat, 9 Apr 2022 13:27:58 +0300
Subject: [PATCH] Avoid importing buf_t from billiard's compat module as it was
removed.
buf_t was a compatibility layer for 2.7, it's no longer needed so it was removed from billiard.
We should adjust the code in Celery as well.
---
celery/concurrency/asynpool.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/celery/concurrency/asynpool.py b/celery/concurrency/asynpool.py
index b9f2875a26..489336936c 100644
--- a/celery/concurrency/asynpool.py
+++ b/celery/concurrency/asynpool.py
@@ -26,7 +26,7 @@
from weakref import WeakValueDictionary, ref
from billiard import pool as _pool
-from billiard.compat import buf_t, isblocking, setblocking
+from billiard.compat import isblocking, setblocking
from billiard.pool import ACK, NACK, RUN, TERMINATE, WorkersJoined
from billiard.queues import _SimpleQueue
from kombu.asynchronous import ERR, WRITE
@@ -868,7 +868,7 @@ def send_job(tup):
header = pack('>I', body_size)
# index 1,0 is the job ID.
job = get_job(tup[1][0])
- job._payload = buf_t(header), buf_t(body), body_size
+ job._payload = memoryview(header), memoryview(body), body_size
put_message(job)
self._quick_put = send_job

7
python-celery.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 28 09:19:04 UTC 2023 - Dirk Müller <dmueller@suse.com>
- add 879af6341974c3778077d8212d78f093b2d77a4f.patch
b260860988469ef8ad74f2d4225839c2fa91d590.patch: better
compatibility with newer billiard
-------------------------------------------------------------------
Mon May 2 10:19:23 UTC 2022 - Markéta Machová <mmachova@suse.com>

17
python-celery.spec
View File

@@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,9 @@ URL: http://celeryproject.org
Source: https://files.pythonhosted.org/packages/source/c/celery/celery-%{version}.tar.gz
Patch0: move-pytest-configuration-to-conftest.patch
Patch1: tests.patch
# PATCH-FIX-UPSTREAM compatibility with newer billiard
Patch2: https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch
Patch3: https://github.com/celery/celery/commit/879af6341974c3778077d8212d78f093b2d77a4f.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: netcfg
@@ -84,8 +87,7 @@ message passing. It is focused on real-time operation, but supports
scheduling as well.
%prep
%setup -q -n celery-%{version}
%autopatch -p1
%autosetup -p1 -n celery-%{version}
%build
%if !%{with test}
@@ -102,7 +104,14 @@ scheduling as well.
%check
%if %{with test}
# test_check_privileges_no_fchown - first it deletes fchown from the system, so it needs root privileges, and then it runs the worker and complains about root privileges
%pytest -k "not test_check_privileges_no_fchown"
# test_init_mongodb_dnspython2_pymongo4_seedlist - pymongo.errors.ConfigurationError: cannot open /etc/resolv.conf
# Temporary, remove
# test_aaa_eventlet_patch::test_aaa_blockdetecet - AssertionError: expected call not found.
# test_AsynPool::test_gen_not_started
%pytest -k "not test_check_privileges_no_fchown and not test_aaa_blockdetecet and not test_gen_not_started and not test_init_mongodb_dnspython2_pymongo4_seedlist"
%endif
%if !%{with test}