Skip to content

ref(cbrs): no more default routing decision #7421

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

Merged
merged 2 commits into from
Sep 18, 2025
Merged

ref(cbrs): no more default routing decision #7421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6280d2
ref(cbrs): no more default routing context
Sep 18, 2025
cc00f65
change
Sep 18, 2025
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
13 changes: 3 additions & 10 deletions snuba/web/rpc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
RPCRequestException,
convert_rpc_exception_to_proto,
)
from snuba.web.rpc.storage_routing.defaults import get_default_routing_decision
from snuba.web.rpc.storage_routing.load_retriever import get_cluster_loadinfo
from snuba.web.rpc.storage_routing.routing_strategies.storage_routing import (
RoutingContext,
Expand Down Expand Up @@ -135,7 +134,6 @@ class RPCEndpoint(Generic[Tin, Tout], metaclass=RegisteredClass):
def __init__(self, metrics_backend: MetricsBackend | None = None) -> None:
self._timer = Timer("endpoint_timing")
self._metrics_backend = metrics_backend or environment.metrics
self.routing_decision = get_default_routing_decision(None)

@classmethod
def request_class(cls) -> Type[Tin]:
Expand Down Expand Up @@ -193,7 +191,7 @@ def execute(self, in_msg: Tin) -> Tout:
span = scope.span
if span is not None:
span.description = self.config_key()
self.routing_decision.routing_context = RoutingContext(timer=self._timer, in_msg=in_msg)
self.routing_context = RoutingContext(timer=self._timer, in_msg=in_msg)

self.__before_execute(in_msg)
error: Exception | None = None
Expand Down Expand Up @@ -265,13 +263,8 @@ def __before_execute(self, in_msg: Tin) -> None:
if state.get_config("storage_routing.enable_get_cluster_loadinfo", True):
get_cluster_loadinfo()

selected_strategy = RoutingStrategySelector().select_routing_strategy(
self.routing_decision.routing_context
)
self.routing_decision.strategy = selected_strategy
self.routing_decision = selected_strategy.get_routing_decision(
self.routing_decision.routing_context
)
selected_strategy = RoutingStrategySelector().select_routing_strategy(self.routing_context)
self.routing_decision = selected_strategy.get_routing_decision(self.routing_context)
self._timer.mark("rpc_start")
self._before_execute(in_msg)

Expand Down
28 changes: 0 additions & 28 deletions snuba/web/rpc/storage_routing/defaults.py
View file
Open in desktop

This file was deleted.

Loading