fix(eap): Set a max execution time for queries (#6925)

This will return an error after 30s of executing the query.
getsentry · Mar 3, 2025 · 5e5e48b · 5e5e48b
1 parent 61f1dfe
commit 5e5e48b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/snuba/datasets/configuration/events_analytics_platform/storages/eap_items.yaml b/snuba/datasets/configuration/events_analytics_platform/storages/eap_items.yaml
@@ -231,6 +231,7 @@ query_processors:
         max_rows_to_group_by: 1000000
         group_by_overflow_mode: any
         max_parallel_replicas: 3
+        max_execution_time: 30
 
 mandatory_condition_checkers:
   - condition: OrgIdEnforcer

diff --git a/snuba/datasets/configuration/events_analytics_platform/storages/eap_spans.yaml b/snuba/datasets/configuration/events_analytics_platform/storages/eap_spans.yaml
@@ -120,6 +120,7 @@ query_processors:
         max_rows_to_group_by: 1000000
         group_by_overflow_mode: any
         max_parallel_replicas: 3
+        max_execution_time: 30
 
 mandatory_condition_checkers:
   - condition: OrgIdEnforcer

diff --git a/snuba/datasets/configuration/events_analytics_platform/storages/spans_num_attrs.yaml b/snuba/datasets/configuration/events_analytics_platform/storages/spans_num_attrs.yaml
@@ -68,6 +68,10 @@ query_processors:
     args:
       columns: [trace_id]
   - processor: TupleUnaliaser
+  - processor: ClickhouseSettingsOverride
+    args:
+      settings:
+        max_execution_time: 30
 
 mandatory_condition_checkers:
   - condition: OrgIdEnforcer

diff --git a/snuba/datasets/configuration/events_analytics_platform/storages/spans_str_attrs.yaml b/snuba/datasets/configuration/events_analytics_platform/storages/spans_str_attrs.yaml
@@ -51,6 +51,10 @@ query_processors:
     args:
       columns: [trace_id]
   - processor: TupleUnaliaser
+  - processor: ClickhouseSettingsOverride
+    args:
+      settings:
+        max_execution_time: 30
 
 mandatory_condition_checkers:
   - condition: OrgIdEnforcer