test erweitert + fix

Author: nPraml

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

@@ -44,4 +44,7 @@ default void onBeforeReturnConnection(Connection connection) {}
    */
   default void onAfterReturnConnection() {}
 
+  default void onBeforeCloseConnection(Connection connection) {}
+
+  default void onAfterCloseConnection() {}
 }

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

@@ -157,6 +157,8 @@ void pstmtCacheMetrics(PstmtCache pstmtCache) {
     pscRem.add(pstmtCache.removeCount());
   }
 
+
+
   final class HeartBeatRunnable extends TimerTask {
     @Override
     public void run() {
@@ -454,8 +456,7 @@ private Connection createConnection() throws SQLException {
     if (poolListener != null) {
       poolListener.onAfterCreateConnection(connection);
     }
-
-    return initConnection(source.getConnection());
+    return connection;
   }
 
   @Override
@@ -572,6 +573,9 @@ private void returnTheConnection(PooledConnection pooledConnection, boolean forc
       poolListener.onBeforeReturnConnection(pooledConnection);
     }
     queue.returnPooledConnection(pooledConnection, forceClose);
+    if (poolListener != null && !forceClose) {
+      poolListener.onAfterReturnConnection();
+    }
     if (forceClose) {
       // Got a bad connection so check the pool
       testConnection();
@@ -584,6 +588,17 @@ void returnConnectionReset(PooledConnection pooledConnection) {
     reset();
   }
 
+  void onBeforeCloseConnection(PooledConnection pooledConnection) {
+    if (poolListener != null) {
+      poolListener.onBeforeCloseConnection(pooledConnection);
+    }
+  }
+
+  void onAfterCloseConnection() {
+    if (poolListener != null) {
+      poolListener.onAfterCloseConnection();
+    }
+  }
   /**
    * Grow the pool by creating a new connection. The connection can either be
    * added to the available list, or returned.

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

@@ -242,6 +242,7 @@ void closeConnectionFully(boolean logErrors) {
     }
     if (pool != null) {
       pool.pstmtCacheMetrics(pstmtCache);
+      pool.onBeforeCloseConnection(this);
     }
     try {
       if (connection.isClosed()) {
@@ -281,6 +282,7 @@ void closeConnectionFully(boolean logErrors) {
     try {
       connection.close();
       pool.dec();
+      pool.onAfterCloseConnection();
     } catch (SQLException ex) {
       if (logErrors || Log.isLoggable(System.Logger.Level.DEBUG)) {
         Log.error("Error when fully closing connection [" + fullDescription() + "]", ex);

ebean-datasource/src/test/java/io/ebean/datasource/test/MultipoolTest.java

@@ -12,9 +12,12 @@
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 @Disabled("run manually")
 class MultipoolTest {
@@ -43,6 +46,26 @@ static void after() {
 	}
 
 	static class PoolManager implements DataSourcePoolListener {
+		List<DataSourcePool> pools = new ArrayList<>();
+		Semaphore semaphore = new Semaphore(120);
+		Random random = new Random();
+
+		@Override
+		public void onBeforeCreateConnection() {
+			try {
+				while (!semaphore.tryAcquire(50, TimeUnit.MILLISECONDS)) {
+					System.out.println("trim required");
+					pools.get(random.nextInt(pools.size())).forceTrim(25);
+				}
+			} catch (InterruptedException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		public void onAfterCloseConnection() {
+			semaphore.release();
+		}
+
 
 	}
 
@@ -56,6 +79,7 @@ void testFalseFriendRollback() throws Exception {
 
 		try {
 			consumeConnections(pool1, 100);
+			//pool1.forceTrim(70);
 			consumeConnections(pool2, 100);
 		} finally {
 			pool1.shutdown();
@@ -84,7 +108,7 @@ void consumeConnections(DataSourcePool pool, int connectionsCount) throws Except
 	}
 
 	private static DataSourcePool getPool() {
-		return DataSourceBuilder.create()
+		DataSourcePool pool = DataSourceBuilder.create()
 				.url(container.jdbcUrl())
 				.username("unit")
 				.password("unit")
@@ -93,5 +117,7 @@ private static DataSourcePool getPool() {
 				.maxConnections(100)
 				.listener(poolManager)
 				.build();
+		poolManager.pools.add(pool);
+		return pool;
 	}
 }