bug-2031736: handle complex query and connection timeout ES errors (#7185)

Author: biancadanforth

socorro/external/es/supersearch.py

@@ -2,20 +2,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-from collections import defaultdict
-from contextlib import suppress
 import datetime
 import re
+from collections import defaultdict
+from contextlib import suppress
 
-from elasticsearch.exceptions import NotFoundError, BadRequestError
-from elasticsearch.dsl import A, Q, Search, AggResponse
+from elasticsearch.dsl import A, AggResponse, Q, Search
+from elasticsearch.exceptions import BadRequestError, ConnectionTimeout, NotFoundError
 
 from socorro.external.es.base import generate_list_of_indexes
 from socorro.external.es.search_common import SearchBase
 from socorro.external.es.super_search_fields import get_search_key
 from socorro.lib import BadArgumentError, MissingArgumentError, libdatetime
 
-
 BAD_INDEX_REGEX = re.compile(r"\[\[(.*)\] missing\]")
 ELASTICSEARCH_PARSE_EXCEPTION_REGEX = re.compile(r"\[([^\]]+)\] could not be parsed")
 
@@ -485,9 +484,31 @@ def get(self, **kwargs):
                             if value == bad_input:
                                 raise BadArgumentError(key) from exc
 
+                with suppress(KeyError):
+                    if (
+                        exc.body["error"]["caused_by"]["type"]
+                        == "too_complex_to_determinize_exception"
+                    ):
+                        raise BadArgumentError(
+                            "query",
+                            msg=(
+                                "Search query is too complex to execute. "
+                                "Simplify the search pattern and try again."
+                            ),
+                        ) from exc
+
                 # Re-raise the original exception
                 raise
 
+            except ConnectionTimeout as exc:
+                raise BadArgumentError(
+                    "query",
+                    msg=(
+                        "Search query timed out. "
+                        "Simplify the search pattern and try again."
+                    ),
+                ) from exc
+
         if shards and shards.failed:
             # Some shards failed. We want to explain what happened in the
             # results, so the client can decide what to do.

socorro/tests/external/es/test_supersearch.py

@@ -3,8 +3,8 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import datetime
-import json
 import http.server
+import json
 import threading
 from contextlib import contextmanager
 from copy import deepcopy
@@ -13,23 +13,26 @@
 
 from socorro import settings
 from socorro.external.es import search_common
-from socorro.external.es.supersearch import SuperSearch
 from socorro.external.es.super_search_fields import FIELDS
+from socorro.external.es.supersearch import SuperSearch
 from socorro.lib import BadArgumentError, libdatetime
-
-from socorro.libclass import build_instance
 from socorro.lib.libdatetime import utc_now
 from socorro.lib.libooid import create_new_ooid
+from socorro.libclass import build_instance
 
 
 @contextmanager
-def mock_es_server(ip, port, post_response):
+def mock_es_server(ip, port, post_response, status_code=200, delay=0):
     class MockHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
         """mock request handler"""
 
         def do_POST(self):  # pylint: disable=invalid-name
             """Handle GET requests"""
-            self.send_response(200)
+            if delay:
+                import time
+
+                time.sleep(delay)
+            self.send_response(status_code)
             self.send_header("Content-Type", "application/json")
             self.send_header("X-Elastic-Product", "Elasticsearch")
             self.end_headers()
@@ -1884,3 +1887,54 @@ def test_get_with_failing_shards(self, es_helper):
                 {"type": "shards", "index": "other_index", "shards_count": 1},
             ]
             assert res["errors"] == errors_exp
+
+    def test_get_with_too_complex_query(self, es_helper):
+        ip, port = "127.0.0.1", 9998
+        too_complex_response = {
+            "error": {
+                "root_cause": [
+                    {
+                        "type": "too_complex_to_determinize_exception",
+                        "reason": (
+                            "Determinizing automaton with 501 states and 125250 "
+                            "transitions would require more than 10000 effort."
+                        ),
+                    }
+                ],
+                "type": "search_phase_execution_exception",
+                "reason": "all shards failed",
+                "phase": "query",
+                "grouped": True,
+                "failed_shards": [],
+                "caused_by": {
+                    "type": "too_complex_to_determinize_exception",
+                    "reason": (
+                        "Determinizing automaton with 501 states and 125250 "
+                        "transitions would require more than 10000 effort."
+                    ),
+                },
+            },
+            "status": 400,
+        }
+        with settings.override(**{"ES_STORAGE.options.url": f"http://{ip}:{port}"}):
+            crashstorage = self.build_crashstorage()
+            api = SuperSearchWithFields(crashstorage=crashstorage)
+
+            with mock_es_server(ip, port, too_complex_response, status_code=400):
+                with pytest.raises(BadArgumentError):
+                    api.get(signature="@a?a?a?a?a?")
+
+    def test_get_with_connection_timeout(self, es_helper):
+        ip, port = "127.0.0.1", 9999
+        with settings.override(
+            **{
+                "ES_STORAGE.options.url": f"http://{ip}:{port}",
+                "ES_STORAGE.options.timeout": 0.05,
+            }
+        ):
+            crashstorage = self.build_crashstorage()
+            api = SuperSearchWithFields(crashstorage=crashstorage)
+
+            with mock_es_server(ip, port, {}, delay=0.2):
+                with pytest.raises(BadArgumentError):
+                    api.get(signature="@a?a?a?a?a?")