Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redis transport - Redelivered messages should respect the original priority #2026

Merged
merged 10 commits into from
Jun 25, 2024
Merged

Redis transport - Redelivered messages should respect the original priority #2026

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8163a00
Redelivered messages should respect the original priority
zemek Jun 13, 2024
ef64cec
update restore message test to check priority
zemek Jun 17, 2024
7f95ead
flake8
zemek Jun 17, 2024
2332dd2
add integration tests
zemek Jun 24, 2024
5414416
also add integration test for mongodb
zemek Jun 24, 2024
9c01b67
flake8
zemek Jun 24, 2024
0449c05
Merge branch 'main' into redis_redelivery_pri
Nusnus Jun 24, 2024
32f8fe1
temporarily removing python 3.9 from CI due to unrelated failures
zemek Jun 24, 2024
7cb8e1f
Update .github/workflows/ci.yaml
auvipy Jun 25, 2024
450283f
Merge branch 'main' into redis_redelivery_pri
Nusnus Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion kombu/transport/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,8 +789,10 @@ def _do_restore_message(self, payload, exchange, routing_key,
except KeyError:
pass
for queue in self._lookup(exchange, routing_key):
pri = self._get_message_priority(payload, reverse=False)

(pipe.lpush if leftmost else pipe.rpush)(
queue, dumps(payload),
self._q_for_pri(queue, pri), dumps(payload),
)
except Exception:
crit('Could not restore message: %r', payload, exc_info=True)
Expand Down
5 changes: 3 additions & 2 deletions t/unit/transport/test_redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ def test_do_restore_message_celery(self):
"exchange": "",
"routing_key": "celery",
},
"priority": 0,
"priority": 3,
"body_encoding": "base64",
"delivery_tag": "badb725e-9c3e-45be-b0a4-07e44630519f",
},
Expand All @@ -627,7 +627,8 @@ def test_do_restore_message_celery(self):
payload, 'exchange', 'routing_key', client,
)

client.rpush.assert_called_with(queue, dumps(result_payload))
client.rpush.assert_called_with(self.channel._q_for_pri(queue, 3),
dumps(result_payload))

def test_restore_no_messages(self):
message = Mock(name='message')
Expand Down