Skip to content

ref(inc-2150): handle future TimeoutError #7919

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
MeredithAnya wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

ref(inc-2150): handle future TimeoutError #7919

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
11 changes: 10 additions & 1 deletion snuba/subscriptions/executor_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import time
from collections import deque
from concurrent.futures import ThreadPoolExecutor
from concurrent.futures import TimeoutError as FutureTimeoutError
from datetime import datetime
from typing import Deque, Mapping, Optional, Sequence, Tuple

Expand Down Expand Up @@ -370,8 +371,16 @@ def join(self, timeout: Optional[float] = None) -> None:

message, result_future = self.__queue.popleft()

try:
result = result_future.future.result(remaining)
except FutureTimeoutError:
logger.warning(
f"Timed out waiting for future, {len(self.__queue)} futures remaining in queue"
)
break

transformed_message = self.__result_encoder.encode(
SubscriptionTaskResult(result_future.task, result_future.future.result(remaining))
SubscriptionTaskResult(result_future.task, result)
Copy link
Copy Markdown

@cursor cursor Bot May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shutdown blocks indefinitely after catching future timeout

Medium Severity

Catching FutureTimeoutError and breaking out of the loop creates a new code path where self.__executor.shutdown() (with default wait=True) is reached after a future has timed out. Previously, the TimeoutError would propagate and skip shutdown() entirely. Now, shutdown() blocks until the still-running timed-out future completes — which can far exceed the 5-second join_timeout, effectively turning "crash on timeout" into "hang on timeout."

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 3dab492. Configure here.

)

self.__next_step.submit(message.replace(transformed_message))
Expand Down
Loading