Zwischencommit

Author: rPraml

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourceBuilder.java

@@ -879,6 +879,11 @@ interface Settings extends DataSourceBuilder {
      */
     Driver driver();
 
+    /**
+     * Returns the name of the pool.
+     */
+    String name();
+
     /**
      * Return the driver class to use (if an instance is not provided).
      */

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourceConfig.java

@@ -85,7 +85,7 @@ public class DataSourceConfig implements DataSourceBuilder.Settings {
   private boolean shutdownOnJvmExit;
   private boolean validateOnHeartbeat = !System.getenv().containsKey("LAMBDA_TASK_ROOT");
   private boolean enforceCleanClose;
-  private int affinitySize = 257;
+  private int affinitySize = 0;
   private Supplier<Object> affinityProvider;
 
   @Override
@@ -225,6 +225,11 @@ public DataSourceConfig setName(String name) {
     return this;
   }
 
+  @Override
+  public String name() {
+    return name;
+  }
+
   @Override
   public DataSource dataSource() {
     return dataSource;

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourcePoolListener.java

@@ -18,7 +18,7 @@ public interface DataSourcePoolListener {
   /**
    * allows interception in the init phase.
    */
-  default Connection initConnection(DataSourcePool pool, Connection conn) {
+  default Connection initConnection(DataSourcePool pool, Connection conn) throws SQLException {
     return conn;
   }
 

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -127,12 +127,11 @@ final class ConnectionPool implements DataSourcePool {
     this.applicationName = params.getApplicationName();
     this.clientInfo = params.getClientInfo();
     if (params.getAffinityProvider() == null) {
-      this.affinitySize = 0;
       this.affinityProvider = () -> null; // dummy
     } else {
       this.affinityProvider = params.getAffinityProvider();
-      this.affinitySize = params.getAffinitySize();
     }
+    this.affinitySize = params.getAffinitySize();
     this.queue = new PooledConnectionQueue(this);
     this.schema = params.getSchema();
     this.catalog = params.catalog();
@@ -190,7 +189,12 @@ private void tryEnsureMinimumConnections() {
         notify.dataSourceUp(this);
       }
     } catch (SQLException e) {
+      dataSourceUp.set(false);
+      dataSourceDownReason = e;
       Log.error("Error trying to ensure minimum connections, maybe db server is down - message:" + e.getMessage(), e);
+      if (notify != null) {
+        notify.dataSourceDown(this, e);
+      }
     } finally {
       notifyLock.unlock();
     }