Skip to content

fix: reclaim pending messages after empty stream reads #142

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

Open
adrian-dankiv-webflow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: reclaim pending messages after empty stream reads #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions taskiq_redis/redis_broker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ async def listen(self) -> AsyncGenerator[AckableMessage, None]:
noack=False,
count=self.count,
)
if not fetched:
continue
for stream, msg_list in fetched: # type: ignore[str-unpack]
for msg_id, msg in msg_list: # type: ignore[str-unpack,union-attr]
logger.debug("Received message: %s", msg)
Expand Down
50 changes: 50 additions & 0 deletions tests/test_broker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,56 @@ def test_no_url_should_raise_typeerror() -> None:
ListQueueBroker() # type: ignore


@pytest.mark.anyio
async def test_stream_reclaims_without_new_messages(
valid_broker_message: BrokerMessage,
redis_url: str,
) -> None:
stream = uuid.uuid4().hex
broker = RedisStreamBroker(
url=redis_url,
queue_name=stream,
consumer_group_name=stream,
xread_block=10,
idle_timeout=600_000,
unacknowledged_batch_size=1,
unacknowledged_lock_timeout=600,
)
await broker.startup()
listener = broker.listen()
try:
async with Redis(connection_pool=broker.connection_pool) as redis:
message_id = await redis.xadd(
stream,
{"data": valid_broker_message.message},
)
await redis.xreadgroup(
stream,
"dead-worker",
{stream: ">"},
count=1,
)
await redis.xclaim(
stream,
stream,
"dead-worker",
0,
[message_id],
idle=broker.idle_timeout + 1000,
justid=True,
)
recovered = await asyncio.wait_for(anext(listener), timeout=1)
assert recovered.data == valid_broker_message.message
pending_ack = recovered.ack()
assert pending_ack is not None
await pending_ack
finally:
await listener.aclose()
async with Redis(connection_pool=broker.connection_pool) as redis:
await redis.delete(stream, f"autoclaim:{stream}:{stream}")
await broker.shutdown()


async def get_message(
broker: AsyncBroker,
) -> bytes | AckableMessage:
Expand Down