#32 - Add detection of read-only errors that should reset the pool

Author: rbygrave

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-datasource</artifactId>
-  <version>4.7.4-SNAPSHOT</version>
+  <version>4.8.1-SNAPSHOT</version>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean-datasource.git</developerConnection>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource-api</artifactId>
-      <version>4.7</version>
+      <version>4.8</version>
     </dependency>
 
     <dependency>
@@ -43,14 +43,14 @@
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.2.2</version>
+      <version>3.1.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.5</version>
+      <version>42.2.11</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -676,6 +676,12 @@ private void returnTheConnection(PooledConnection pooledConnection, boolean forc
     }
   }
 
+  void returnConnectionReset(PooledConnection pooledConnection) {
+    queue.returnPooledConnection(pooledConnection, true);
+    logger.warn("Resetting DataSourcePool on read-only failure [{}]", name);
+    reset();
+  }
+
   /**
    * Returns information describing connections that are currently being used.
    */

src/main/java/io/ebean/datasource/pool/ExtendedPreparedStatement.java

@@ -96,59 +96,59 @@ public void close() {
   public void addBatch() throws SQLException {
     try {
       delegate.addBatch();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
   @Override
   public void clearParameters() throws SQLException {
     try {
       delegate.clearParameters();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
   @Override
   public boolean execute() throws SQLException {
     try {
       return delegate.execute();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
   @Override
   public ResultSet executeQuery() throws SQLException {
     try {
       return delegate.executeQuery();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
   @Override
   public int executeUpdate() throws SQLException {
     try {
       return delegate.executeUpdate();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
   @Override
   public ResultSetMetaData getMetaData() throws SQLException {
     try {
       return delegate.getMetaData();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 

src/main/java/io/ebean/datasource/pool/ExtendedStatement.java

@@ -42,9 +42,9 @@ abstract class ExtendedStatement extends PreparedStatementDelegator {
   public Connection getConnection() throws SQLException {
     try {
       return delegate.getConnection();
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
@@ -56,9 +56,9 @@ public void addBatch(String sql) throws SQLException {
     try {
       pooledConnection.setLastStatement(sql);
       delegate.addBatch(sql);
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
@@ -70,9 +70,9 @@ public boolean execute(String sql) throws SQLException {
     try {
       pooledConnection.setLastStatement(sql);
       return delegate.execute(sql);
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
@@ -84,9 +84,9 @@ public ResultSet executeQuery(String sql) throws SQLException {
     try {
       pooledConnection.setLastStatement(sql);
       return delegate.executeQuery(sql);
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }
 
@@ -98,9 +98,9 @@ public int executeUpdate(String sql) throws SQLException {
     try {
       pooledConnection.setLastStatement(sql);
       return delegate.executeUpdate(sql);
-    } catch (SQLException e) {
-      pooledConnection.markWithError();
-      throw e;
+    } catch (SQLException ex) {
+      pooledConnection.markWithError(ex);
+      throw ex;
     }
   }