Skip to content

Commit

Permalink
Preserve nicely formatted timeout exception (#1187)
Browse files Browse the repository at this point in the history
* use dynamic schema in test_grant_access_to.py

* use dynamic schema in test_grant_access_to.py

* revert setup

* Add descriptive error message on query timeout

* Add descriptive error message on query timeout
  • Loading branch information
colin-rogers-dbt authored Apr 19, 2024
1 parent 55689b9 commit b62ce74
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions dbt/adapters/bigquery/connections.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from concurrent.futures import TimeoutError
import json
import re
from contextlib import contextmanager
Expand Down Expand Up @@ -736,9 +737,12 @@ def _query_and_results(
logger.debug(
self._bq_job_link(query_job.location, query_job.project, query_job.job_id)
)

iterator = query_job.result(max_results=limit, timeout=job_execution_timeout)
return query_job, iterator
try:
iterator = query_job.result(max_results=limit, timeout=job_execution_timeout)
return query_job, iterator
except TimeoutError:
exc = f"Operation did not complete within the designated timeout of {job_execution_timeout} seconds."
raise TimeoutError(exc)

def _retry_and_handle(self, msg, conn, fn):
"""retry a function call within the context of exception_handler."""
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_bigquery_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from dbt.adapters.bigquery.connections import _sanitize_label, _VALIDATE_LABEL_LENGTH_LIMIT
from dbt_common.clients import agate_helper
import dbt_common.exceptions
from dbt.context.manifest import generate_query_header_context
from dbt.context.query_header import generate_query_header_context
from dbt.contracts.files import FileHash
from dbt.contracts.graph.manifest import ManifestStateCheck
from dbt.logger import GLOBAL_LOGGER as logger # noqa
Expand Down

0 comments on commit b62ce74

Please sign in to comment.