REBASED on dev/0.18.1; moved CHANGELOG entries

dbt-labs · Sep 30, 2020 · fc474a0 · fc474a0
1 parent 8fd8fa0
commit fc474a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## dbt 0.18.1 (Release TBD)
 
+### Features
+- Added retry support for rateLimitExceeded error from BigQuery, ([#2795](https:/fishtown-analytics/dbt/issues/2795), [#2796](https:/fishtown-analytics/dbt/issues/2796))
+
+Contributors:
+- [@championj-foxtel](https:/championj-foxtel) ([#2796](https:/fishtown-analytics/dbt/issues/2796))
+
 ## dbt 0.18.1b3 (September 25, 2020)
 
 

diff --git a/plugins/bigquery/dbt/adapters/bigquery/connections.py b/plugins/bigquery/dbt/adapters/bigquery/connections.py
@@ -477,4 +477,7 @@ def _is_retryable(error):
  """Return true for errors that are unlikely to occur again if retried."""
  if isinstance(error, RETRYABLE_ERRORS):
  return True
+ elif isinstance(error, google.api_core.exceptions.Forbidden) and any(
+ e['reason'] == 'rateLimitExceeded' for e in error.errors):
+ return True
  return False
diff --git a/test/unit/test_bigquery_adapter.py b/test/unit/test_bigquery_adapter.py
@@ -487,11 +487,13 @@ def test_is_retryable(self):
  bad_request_error = exceptions.BadRequest('code broke')
  connection_error = ConnectionError('code broke')
  client_error = exceptions.ClientError('bad code')
+ rate_limit_error = exceptions.Forbidden("code broke", errors=[{"reason": "rateLimitExceeded"}])
 
  self.assertTrue(_is_retryable(internal_server_error))
  self.assertTrue(_is_retryable(bad_request_error))
  self.assertTrue(_is_retryable(connection_error))
  self.assertFalse(_is_retryable(client_error))
+ self.assertTrue(_is_retryable(rate_limit_error))
 
  def test_drop_dataset(self):
  mock_table = Mock()