Add initializationFailTimeout repo parameter

It is to allow midPoint container to wait until repository is up and not failing preliminarily. The default of 1 ms is set to keep the current behavior.
Evolveum · Aug 9, 2018 · 10893bf · 10893bf
1 parent bdd3017
commit 10893bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java
@@ -117,6 +117,8 @@ private HikariConfig createConfig() {
 //            config.addDataSourceProperty("maintainTimeStats", "false");
         }
 
+        config.setInitializationFailTimeout(configuration.getInitializationFailTimeout());
+
         return config;
     }
 

diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
@@ -237,6 +237,8 @@ public enum WrongSchemaAction {
 
 	public static final String PROPERTY_MISSING_SCHEMA_ACTION = "missingSchemaAction";
 
+	public static final String PROPERTY_INITIALIZATION_FAIL_TIMEOUT = "initializationFailTimeout";
+
     private static final String DRIVER_H2 = Driver.class.getName();
     private static final String DRIVER_MYSQL = "com.mysql.cj.jdbc.Driver";
     private static final String DRIVER_MARIADB = "org.mariadb.jdbc.Driver";
@@ -299,6 +301,8 @@ public enum WrongSchemaAction {
     private final boolean skipOrgClosureStructureCheck;
     private final boolean stopOnOrgClosureStartupFailure;
 
+    private final long initializationFailTimeout;
+
     @NotNull private final MissingSchemaAction missingSchemaAction;
 
 	/*
@@ -389,6 +393,7 @@ public SqlRepositoryConfiguration(Configuration configuration) {
         stopOnOrgClosureStartupFailure = configuration.getBoolean(PROPERTY_STOP_ON_ORG_CLOSURE_STARTUP_FAILURE, true);
 
         missingSchemaAction = MissingSchemaAction.fromValue(configuration.getString(PROPERTY_MISSING_SCHEMA_ACTION));
+        initializationFailTimeout = configuration.getLong(PROPERTY_INITIALIZATION_FAIL_TIMEOUT, 1L);
     }
 
 	private String getDefaultEmbeddedJdbcUrl() {
@@ -803,4 +808,8 @@ public Database getDatabase() {
 	public MissingSchemaAction getMissingSchemaAction() {
 		return missingSchemaAction;
 	}
+
+	public long getInitializationFailTimeout() {
+		return initializationFailTimeout;
+	}
 }