PLUGIN-1823: Retrying all SQLTransientExceptions #597

sgarg-CS · 2025-05-16T11:36:26Z

Add Failsafe Retry poilcy to all the places in the database-plugins where SQLTransientException could be thrown.

Added three new properties (hidden from UI)

Initial Retry Duration (Default: 5sec)
Max Retry Duration (Default: 80 sec)
Max Retry Count (Default: 5)

google-cla · 2025-05-16T11:36:31Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

itsankit-google

Overall, this looks everything is getting wrapped within Failsafe where we might end up with having nested level retries, we need to ensure we add retries only where we are actually interacting with JDBC client and not top level functions.

For example adding retries to DriverManager.getConnection(connectionString, connectionProperties) makes sense because you are actually interacting with the source db but adding retries to whole loadSchema(Connection connection, String query) do not makes sense we need to be careful while adding such retries.

database-commons/src/main/java/io/cdap/plugin/db/action/DBRun.java

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

itsankit-google · 2025-05-30T05:31:01Z

Please note E2E should not be modified and not fail with these changes. Otherwise, we have done something wrong which does not give expected failure messages.

database-commons/src/main/java/io/cdap/plugin/db/sink/AbstractDBSink.java

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

itsankit-google

I can see some level of duplication in both AbstractDBSource & AbstractDBSink, can we please move it to the common AbstractDBUtil class?

database-commons/src/main/java/io/cdap/plugin/db/ConnectionConfig.java

cloudsql-mysql-plugin/src/test/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSinkTest.java

database-commons/src/main/java/io/cdap/plugin/db/connector/AbstractDBSpecificConnector.java

itsankit-google

public final class RetryUtils {

  public static Connection createConnectionWithRetry(RetryPolicy<?> retryPolicy, String connectionString,
                                                     Properties connectionProperties, String externalDocumentationLink) throws Exception {
    try {
      return Failsafe.with(retryPolicy).get(() ->
        DriverManager.getConnection(connectionString, connectionProperties)
      );
    } catch (Exception e) {
      throw unwrapFailsafeException(e, externalDocumentationLink);
    }
  }

  public static Statement createStatementWithRetry(RetryPolicy<?> retryPolicy,
                                                   Connection connection, String externalDocumentationLink) throws Exception {
    try {
      return Failsafe.with(retryPolicy).get(connection::createStatement);
    } catch (Exception e) {
      throw unwrapFailsafeException(e, externalDocumentationLink);
    }
  }

  public static PreparedStatement prepareStatementWithRetry(RetryPolicy<?> retryPolicy,
                                                            Connection connection,
                                                            String sqlQuery, String externalDocumentationLink) throws Exception {
    try {
      return Failsafe.with(retryPolicy).get(() ->
        connection.prepareStatement(sqlQuery)
      );
    } catch (Exception e) {
      throw unwrapFailsafeException(e, externalDocumentationLink);
    }
  }

 public static ResultSet executeWithRetry(RetryPolicy<?> retryPolicy,
                                                            Connection connection,
                                                            String sqlQuery, String externalDocumentationLink) throws Exception {
        try {
            return Failsafe.with(retryPolicy).get(() -> connection.createStatement().executeQuery(sqlQuery));
        } catch (Exception e) {
            throw unwrapFailsafeException(e, externalDocumentationLink);
        }
    }

 private static Exception unwrapFailsafeException(Exception e) {
    if (e instanceof FailsafeException && e.getCause() instanceof Exception) {
        if (e instanceOf SQLException) {
           return programFailureException(e, externalDocumentationLink);
        } else {
          return (Exception) e.getCause();
       }
    }
    return e;
  }
  
private static ProgramFailureException programFailureException(SQLException e, String externalDocumentationLink) {
    // wrap exception to ensure SQLException-child instances not exposed to contexts without jdbc
    // driver in classpath
    String errorMessage =
      String.format("SQL Exception occurred: [Message='%s', SQLState='%s', ErrorCode='%s'].",
        e.getMessage(), e.getSQLState(), e.getErrorCode());
    String errorMessageWithDetails = String.format("Error occurred while trying to" +
      " get schema from database." + "Error message: '%s'. Error code: '%s'. SQLState: '%s'", e.getMessage(),
        e.getErrorCode(), e.getSQLState());
 
    if (!Strings.isNullOrEmpty(externalDocumentationLink)) {
      if (!errorMessage.endsWith(".")) {
        errorMessage = errorMessage + ".";
      }
      errorMessage = String.format("%s For more details, see %s", errorMessage, externalDocumentationLink);
    }
    return ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
      errorMessage, errorMessageWithDetails, ErrorType.USER, false, ErrorCodeType.SQLSTATE, e.getSQLState(),
        externalDocumentationLink, e);
  }
}

You can create a RetryUtils like above which accepts connection params.

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

Move retry logic into a separate class: RetryUtils and add exception handling

sgarg-CS · 2025-06-03T14:04:42Z

Overall, this looks everything is getting wrapped within Failsafe where we might end up with having nested level retries, we need to ensure we add retries only where we are actually interacting with JDBC client and not top level functions.

For example adding retries to DriverManager.getConnection(connectionString, connectionProperties) makes sense because you are actually interacting with the source db but adding retries to whole loadSchema(Connection connection, String query) do not makes sense we need to be careful while adding such retries.

Refactored the code to add the retry logic only for the methods interacting with the JDBC client.

database-commons/src/main/java/io/cdap/plugin/util/RetryUtils.java

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

database-commons/src/main/java/io/cdap/plugin/util/RetryUtils.java

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

database-commons/src/main/java/io/cdap/plugin/db/sink/AbstractDBSink.java

…rn types for overridden methods to base class

itsankit-google · 2025-06-26T08:36:46Z

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

  protected String getExternalDocumentationLink() {
-    return null;
+    return "https://en.wikipedia.org/wiki/SQLSTATE";


is this method still needed? can we remove it?

Not needed now. Removed. 7c8815d

itsankit-google · 2025-06-26T08:40:40Z

database-commons/src/main/java/io/cdap/plugin/db/action/AbstractDBArgumentSetter.java

+  protected String getExternalDocumentationLink() {
+    return "https://en.wikipedia.org/wiki/SQLSTATE";
+  }


is this method still needed?

No, not needed now. Removed it. 7c8815d

…t longer used now.

itsankit-google · 2025-06-26T11:25:10Z

database-commons/src/main/java/io/cdap/plugin/db/source/AbstractDBSource.java

@@ -87,13 +86,17 @@ public abstract class AbstractDBSource<T extends PluginConfig & DatabaseSourceCo
                                                                Pattern.CASE_INSENSITIVE);
  private static final Pattern WHERE_CONDITIONS = Pattern.compile("\\s+where \\$conditions",
                                                                  Pattern.CASE_INSENSITIVE);
+  private final RetryPolicy<?> retryPolicy;



please remove empty line

Removed 0b57ce6

database-commons/src/main/java/io/cdap/plugin/db/RetryExceptions.java

itsankit-google · 2025-07-10T18:03:00Z

cloudsql-mysql-plugin/src/e2e-test/resources/errorMessage.properties

@@ -1,9 +1,9 @@
-errorMessageInvalidSourceDatabase=SQL error while getting query schema: Error: Unknown database 'invalidDatabase', SQLState: 42000, ErrorCode: 1049
+errorMessageInvalidSourceDatabase=errorMessage: SQL Exception occurred


I still see generic error messages which is bad.

The earlier error message is changed as per the new code, and hence as per the latest code updated the error message not include the dynamic/privacy data present in error msgs here it contains.

As suggested, updated the error message.

itsankit-google

can we please add Open and Capture Logs step to these scenarios :

database-plugins/mssql-plugin/src/e2e-test/features/mssql/mssql source/RunTimeWithMacros.feature

Line 217 in e5c5794

Scenario: Verify pipeline failure message in logs when user provides invalid Table name in importQuery of plugin with Macros
database-plugins/mssql-plugin/src/e2e-test/features/mssql/mssql source/RunTimeWithMacros.feature

Line 258 in e5c5794

Scenario: Verify pipeline failure message in logs when user provides invalid Credentials for connection with Macros
database-plugins/cloudsql-postgresql-plugin/src/e2e-test/features/source/RunTime.feature

Line 114 in e5c5794

Scenario: To verify pipeline failure message in logs when an invalid bounding query is provided
database-plugins/cloudsql-postgresql-plugin/src/e2e-test/features/source/RunTime.feature

Line 156 in e5c5794

Scenario: To verify the pipeline fails while preview with invalid bounding query setting the split-By field

itsankit-google · 2025-07-10T18:24:20Z

database-commons/src/main/java/io/cdap/plugin/util/RetryUtils.java

+            } else if (cause instanceof RuntimeException) {
+                return (RuntimeException) cause;
+            } else if (cause instanceof Error) {
+                return new RuntimeException("Failsafe wrapped an Error", cause);


return new RuntimeException("Operation failed with error", cause);

Updated 7977d45

itsankit-google · 2025-07-10T18:25:44Z

database-commons/src/main/java/io/cdap/plugin/util/RetryUtils.java

+            } else if (cause instanceof Error) {
+                return new RuntimeException("Failsafe wrapped an Error", cause);
+            } else {
+                return new RuntimeException("Failsafe wrapped a non-runtime exception", cause);


return new RuntimeException("Operation failed", cause);

Updated 7977d45

itsmekumari · 2025-07-11T05:50:48Z

can we please add Open and Capture Logs step to these scenarios :

database-plugins/mssql-plugin/src/e2e-test/features/mssql/mssql source/RunTimeWithMacros.feature

Line 217 in e5c5794

Scenario: Verify pipeline failure message in logs when user provides invalid Table name in importQuery of plugin with Macros

database-plugins/mssql-plugin/src/e2e-test/features/mssql/mssql source/RunTimeWithMacros.feature

Line 258 in e5c5794

Scenario: Verify pipeline failure message in logs when user provides invalid Credentials for connection with Macros

database-plugins/cloudsql-postgresql-plugin/src/e2e-test/features/source/RunTime.feature

Line 114 in e5c5794

Scenario: To verify pipeline failure message in logs when an invalid bounding query is provided

database-plugins/cloudsql-postgresql-plugin/src/e2e-test/features/source/RunTime.feature

Line 156 in e5c5794

Scenario: To verify the pipeline fails while preview with invalid bounding query setting the split-By field

Can we address these changes in other PR? We will create a new ticket to address these changes. Please confirm.

itsankit-google · 2025-07-11T06:35:50Z

Can we address these changes in other PR? We will create a new ticket to address these changes. Please confirm.

I am not sure how to verify the e2e changes then?

itsmekumari · 2025-07-14T05:01:49Z

Can we address these changes in other PR? We will create a new ticket to address these changes. Please confirm.

I am not sure how to verify the e2e changes then?

Changes done.

psainics force-pushed the patch/plugin-1823 branch from 7fcb0a0 to 9da75b8 Compare May 19, 2025 09:01

psainics added the build label May 19, 2025

itsmekumari mentioned this pull request May 22, 2025

error message changes #598

Merged

PLUGIN-1823: Retrying all SQLTransientExceptions

ac813f0

sgarg-CS force-pushed the patch/plugin-1823 branch from 9da75b8 to ac813f0 Compare May 26, 2025 05:28

sgarg-CS added build and removed build labels May 27, 2025

sgarg-CS requested a review from itsankit-google May 30, 2025 04:56

itsankit-google requested changes May 30, 2025

View reviewed changes

sgarg-CS added 3 commits May 30, 2025 21:47

PLUGIN-1823: Rework

8b1f12c

Fix unit test for MySQLSinkTest

d0c15c0

Fix failing unit test for CloudSQLMySQLTest

ad6b3fe