You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/05/28 14:11:28 UTC
svn commit: r1682219 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java
Author: reschke
Date: Thu May 28 12:11:28 2015
New Revision: 1682219
URL: http://svn.apache.org/r1682219
Log:
OAK-2918 - RDBConnectionHandler: handle failure on setReadOnly() gracefully (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 12:11:28 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java?rev=1682219&r1=1682218&r2=1682219&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java Thu May 28 12:11:28 2015
@@ -58,7 +58,7 @@ public class RDBConnectionHandler {
public @Nonnull Connection getROConnection() throws SQLException {
Connection c = this.ds.getConnection();
c.setAutoCommit(false);
- c.setReadOnly(true);
+ setReadOnly(c, true);
return c;
}
@@ -68,7 +68,7 @@ public class RDBConnectionHandler {
public @Nonnull Connection getRWConnection() throws SQLException {
Connection c = this.ds.getConnection();
c.setAutoCommit(false);
- c.setReadOnly(false);
+ setReadOnly(c, false);
return c;
}
@@ -93,8 +93,8 @@ public class RDBConnectionHandler {
try {
if (CHECKCONNECTIONONCLOSE) {
try {
- c.setReadOnly(!c.isReadOnly());
- c.setReadOnly(!c.isReadOnly());
+ setReadOnly(c, !c.isReadOnly());
+ setReadOnly(c, !c.isReadOnly());
} catch (SQLException ex2) {
LOG.error("got dirty connection", ex2);
throw new DocumentStoreException("dirty connection on close", ex2);
@@ -138,4 +138,29 @@ public class RDBConnectionHandler {
return null;
}
+
+
+ // workaround for broken connection wrappers
+ // see https://issues.apache.org/jira/browse/OAK-2918
+
+ private Boolean setReadOnlyThrows = null; // null if we haven't checked yet
+ private Boolean setReadWriteThrows = null; // null if we haven't checked yet
+
+ private void setReadOnly(Connection c, boolean ro) throws SQLException {
+
+ Boolean flag = ro ? setReadOnlyThrows : setReadWriteThrows;
+
+ if (flag == null) {
+ // we don't know yet, so we try once
+ try {
+ c.setReadOnly(ro);
+ flag = Boolean.FALSE;
+ } catch (SQLException ex) {
+ flag = Boolean.TRUE;
+ LOG.error("Connection " + c.getClass() + " throws SQLException on setReadOnly(" + ro + "); not trying again");
+ }
+ } else if (!flag) {
+ c.setReadOnly(ro);
+ }
+ }
}