remove retry_all from add_query and set backoff>1 (#1095)

Co-authored-by: Mila Page <[email protected]>

Author: colin-rogers-dbt

dbt-redshift/.changes/unreleased/Fixes-20250513-104430.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: remove retry_all from add_query and set backoff so it actually backs off
+time: 2025-05-13T10:44:30.673728-07:00
+custom:
+  Author: colin-rogers-dbt
+  Issue: "1095"

dbt-redshift/src/dbt/adapters/redshift/connections.py

@@ -551,7 +551,7 @@ def _handle_execute_exception(
                 raise e
             if oid_not_found_msg in str(e):
                 pass
-            elif isinstance(e, redshift_connector.Error) and retry_all:
+            elif isinstance(e, DbtDatabaseError) and retry_all:
                 pass
             else:
                 logger.debug(f"Not retrying error: {e}")
@@ -564,7 +564,7 @@ def _handle_execute_exception(
             self.open(self.get_thread_connection())
             time.sleep(backoff)
             # return with exponential backoff
-            return retries, min(backoff * 2, 60)
+            return retries, min(max(backoff * 2, 2), 60)
 
         def _execute_internal(
             sql: str,
@@ -618,8 +618,6 @@ def add_query(self, sql, auto_begin=True, bindings=None, abridge_sql_log=False):
             redshift_connector.InterfaceError,
             redshift_connector.InternalError,
         )
-        if self.profile.credentials.retry_all:
-            redshift_retryable_exceptions = redshift_connector.Error
 
         for query in queries:
             # Strip off comments from the current query

dbt-redshift/tests/functional/adapter/test_exception_handling.py

@@ -98,4 +98,4 @@ def profiles_config_update(self, dbt_profile_target):
 
     def test_running_bad_model_retries(self, project):
         result, log = run_dbt_and_capture(["run", "--log-level=debug"], expect_pass=False)
-        assert "Got a retryable error" in log
+        assert "Retrying query due to error" in log

dbt-redshift/tests/unit/test_query.py

@@ -5,7 +5,7 @@
 
 from dbt.adapters.sql.connections import SQLConnectionManager
 from dbt_common.clients import agate_helper
-from dbt_common.exceptions import DbtRuntimeError
+from dbt_common.exceptions import DbtRuntimeError, DbtDatabaseError
 
 from dbt.adapters.redshift import (
     Plugin as RedshiftPlugin,
@@ -111,8 +111,8 @@ def test_execute_with_retry_all(self):
                 self.adapter.connections.profile.credentials.retries = 3
                 self.adapter.connections.profile.credentials.retry_all = True
                 mock_add_query.side_effect = [
-                    redshift_connector.InterfaceError,
-                    redshift_connector.InternalError,
+                    DbtDatabaseError("test"),
+                    DbtDatabaseError("test2"),
                     (None, cursor),
                 ]
                 with mock.patch.object(