DS-2259: Database - fix database settings initialization and increase statement timeout.

Signed-off-by: mchrza <maximilian.chrzan@here.com>

Author: mchrza

xyz-jobs/xyz-job-steps/src/main/java/com/here/xyz/jobs/steps/execution/db/Database.java

@@ -55,7 +55,12 @@
 import software.amazon.awssdk.services.rds.model.DBCluster;
 
 public class Database extends ExecutionResource {
-  private static final int STATEMENT_TIMEOUT = 100;
+  private static final int STATEMENT_TIMEOUT = 895; //seconds - has to greater than the query timeouts
+  private static final int DB_CHECKOUT_TIMEOUT_MS = 20_000;
+  private static final int DB_ACQUIRE_RETRY_DELAY_MS = 5_000;
+  private static final int DB_ACQUIRE_RETRY_ATTEMPTS = 10;
+  private static final int DB_ACQUIRE_INCREMENT = 3;
+  private static final int DB_MAX_POOL_SIZE = 10;
   private static final List<ScriptResourcePath> SCRIPT_RESOURCE_PATHS = List.of(new ScriptResourcePath("/sql", "jobs", "common"), new ScriptResourcePath("/jobs", "jobs"));
   private static final Logger logger = LogManager.getLogger();
   private static final float DB_MAX_JOB_UTILIZATION_PERCENTAGE = 0.6f;
@@ -107,12 +112,23 @@ static void closeAll() {
 
   DatabaseSettings getDatabaseSettings() {
     if (dbSettings == null)
-      dbSettings = new RestrictedDatabaseSettings(getName(), connectorDbSettingsMap)
-          .withApplicationName("JobFramework")
-          .withScriptResourcePaths(SCRIPT_RESOURCE_PATHS);
+      dbSettings = applyRuntimeDbSettings(new RestrictedDatabaseSettings(getName(), connectorDbSettingsMap)
+          .withApplicationName("JobFramework"));
     return dbSettings;
   }
 
+  private static <T extends DatabaseSettings> T applyRuntimeDbSettings(T settings) {
+    settings
+        .withStatementTimeoutSeconds(STATEMENT_TIMEOUT)
+        .withDbCheckoutTimeout(DB_CHECKOUT_TIMEOUT_MS)
+        .withDbAcquireRetryDelay(DB_ACQUIRE_RETRY_DELAY_MS)
+        .withDbAcquireRetryAttempts(DB_ACQUIRE_RETRY_ATTEMPTS)
+        .withDbAcquireIncrement(DB_ACQUIRE_INCREMENT)
+        .withDbMaxPoolSize(DB_MAX_POOL_SIZE)
+        .withScriptResourcePaths(SCRIPT_RESOURCE_PATHS);
+    return settings;
+  }
+
   public static Future<List<Database>> getAll() {
     logger.info("Gathering all database objects ...");
     List<Database> allDbs = cache.getIfPresent(ALL_DATABASES);
@@ -202,14 +218,7 @@ private static List<Database> loadDatabasesForConnector(Connector connector) {
             connectorParameters.getEcps());
         fixLocalDbHosts(connectorDbSettingsMap);
 
-        DatabaseSettings connectorDbSettings = new DatabaseSettings(connector.id, connectorDbSettingsMap)
-            .withStatementTimeoutSeconds(STATEMENT_TIMEOUT)
-            .withDbCheckoutTimeout(20_000)
-            .withDbAcquireRetryDelay(5_000)
-            .withDbAcquireRetryAttempts(10)
-            .withDbAcquireIncrement(3)
-            .withDbMaxPoolSize(10)
-            .withScriptResourcePaths(SCRIPT_RESOURCE_PATHS);
+        DatabaseSettings connectorDbSettings = applyRuntimeDbSettings(new DatabaseSettings(connector.id, connectorDbSettingsMap));
 
         String rdsClusterId = DBClusterResolver.getClusterIdFromHostname(connectorDbSettings.getHost());