moves connection validation closer to startup

Author: awildturtok

backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java

@@ -85,7 +85,9 @@ public void run(Manager manager) throws InterruptedException {
 		formScanner = new FormScanner(config);
 
 		// TODO this could be implemented as a plugin tbh
-		config.getSqlConnectorConfig().initialize(environment);
+		if(config.getSqlConnectorConfig() != null) {
+			config.getSqlConnectorConfig().initialize(environment);
+		}
 
 		// Init all plugins
 		config.getPlugins().forEach(pluginConfig -> pluginConfig.initialize(this));

backend/src/main/java/com/bakdata/conquery/models/config/DatabaseConnection.java

@@ -1,7 +1,7 @@
 package com.bakdata.conquery.models.config;
 
-import java.io.Closeable;
 import java.io.IOException;
+import java.sql.SQLException;
 
 import com.codahale.metrics.health.HealthCheckRegistry;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -34,7 +34,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Slf4j
-public class DatabaseConnection implements Closeable, Managed {
+public class DatabaseConnection implements Managed {
 
 	private static final String DEFAULT_PRIMARY_COLUMN = "pid";
 
@@ -96,12 +96,16 @@ public void initializeDataSource() {
 		dataSource = new HikariDataSource(hikariConfig);
 
 		try {
-			log.debug("TESTING connection {}", getJdbcConnectionUrl());
-			DSLContext dslContext = DSL.using(this.dataSource, getDialect().getJooqDialect());
-			dslContext.execute(getDialect().getTestConnection());
-			log.debug("SUCCESS connecting to {}", getJdbcConnectionUrl());
-		}catch (Exception exception) {
-			log.error("FAILED to connect to {}", getJdbcConnectionUrl(), exception);
+			log.debug("TEST connecting to {}", getJdbcConnectionUrl());
+			if (dataSource.getConnection().isValid(100)) {
+				log.info("SUCCESS connecting to {}", getJdbcConnectionUrl());
+			}
+			else {
+				log.error("FAILED connecting to {}. Connection did not become valid.", getJdbcConnectionUrl());
+			}
+		}
+		catch (SQLException exception) {
+			log.error("FAILED connecting to {}", getJdbcConnectionUrl(), exception);
 		}
 	}
 
@@ -124,7 +128,7 @@ public DSLContext connect(SqlConnectorConfig connectorConfig) {
 	}
 
 	@Override
-	public void close() throws IOException {
+	public void stop() throws IOException {
 		dataSource.close();
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/config/SqlConnectorConfig.java

@@ -4,20 +4,17 @@
 import jakarta.validation.Valid;
 
 import com.bakdata.conquery.models.datasets.Dataset;
-import com.codahale.metrics.health.HealthCheckRegistry;
+import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dropwizard.core.setup.Environment;
 import io.dropwizard.lifecycle.Managed;
-import io.dropwizard.util.Duration;
 import io.dropwizard.validation.ValidationMethod;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.extern.jackson.Jacksonized;
 import lombok.extern.slf4j.Slf4j;
-import org.jooq.DSLContext;
 
 /**
  * Configuration for SQL databases to send dataset queries to.
@@ -32,7 +29,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Slf4j
-public class SqlConnectorConfig {
+public class SqlConnectorConfig implements Managed {
 
 	private boolean enabled;
 
@@ -44,15 +41,19 @@ public class SqlConnectorConfig {
 	/**
 	 * Keys must match the name of existing {@link Dataset}s.
 	 */
-	private Map<String, @Valid DatabaseConnection> databaseConfigs;
+	private Map<DatasetId, @Valid DatabaseConnection> databaseConfigs;
 
 
 	public DatabaseConnection getDatabaseConfig(Dataset dataset) {
-		return databaseConfigs.get(dataset.getName());
+		return databaseConfigs.get(dataset.getId());
 	}
 
 
 	public void initialize(Environment environment) {
+		if(databaseConfigs == null || !enabled){
+			return;
+		}
+
 		for (DatabaseConnection connection : databaseConfigs.values()) {
 			connection.setHealthCheckRegistry(environment.healthChecks());
 			environment.lifecycle().manage(connection);

backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java

@@ -81,7 +81,7 @@ static void before() {
 
 	@AfterAll
 	static void after() throws IOException {
-		databaseConfig.close();
+		databaseConfig.stop();
 	}
 
 	@Test

backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/TestSqlConnectorConfig.java

@@ -5,6 +5,7 @@
 import com.bakdata.conquery.models.config.DatabaseConnection;
 import com.bakdata.conquery.models.config.SqlConnectorConfig;
 import com.bakdata.conquery.models.datasets.Dataset;
+import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.NoArgsConstructor;
 
@@ -15,12 +16,12 @@ public class TestSqlConnectorConfig extends SqlConnectorConfig {
 	private static final String TEST_DATASET = "test";
 
 	public TestSqlConnectorConfig(DatabaseConnection databaseConfig) {
-		super(true, true, Map.of(TEST_DATASET, databaseConfig));
+		super(true, true, Map.of(new DatasetId(TEST_DATASET), databaseConfig));
 	}
 
 	@Override
 	public DatabaseConnection getDatabaseConfig(Dataset dataset) {
-		return getDatabaseConfigs().get(TEST_DATASET);
+		return getDatabaseConfigs().get(new DatasetId(TEST_DATASET));
 	}
 
 }