You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/01/19 18:14:05 UTC
svn commit: r1725569 - in
/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb:
StandardEnvironmentFacade.java replication/ReplicatedEnvironmentFacade.java
Author: orudyy
Date: Tue Jan 19 17:14:04 2016
New Revision: 1725569
URL: http://svn.apache.org/viewvc?rev=1725569&view=rev
Log:
QPID-6999: Throw ConnectionScopeRuntimeException for IllegalStateException thrown from JE Environment on commits for aborted transactions
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java?rev=1725569&r1=1725568&r2=1725569&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java Tue Jan 19 17:14:04 2016
@@ -47,6 +47,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.berkeleydb.logging.Slf4jLoggingHandler;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
public class StandardEnvironmentFacade implements EnvironmentFacade
{
@@ -140,13 +141,12 @@ public class StandardEnvironmentFacade i
{
tx.commitNoSync();
}
- catch (DatabaseException de)
+ catch (RuntimeException de)
{
LOGGER.error("Got DatabaseException on commit, closing environment", de);
closeEnvironmentSafely();
-
- throw handleDatabaseException("Got DatabaseException on commit", de);
+ handleCommitException(tx, de);
}
_committer.commit(tx, syncCommit);
}
@@ -158,13 +158,12 @@ public class StandardEnvironmentFacade i
{
tx.commitNoSync();
}
- catch (DatabaseException de)
+ catch (RuntimeException de)
{
LOGGER.error("Got DatabaseException on commit, closing environment", de);
closeEnvironmentSafely();
-
- throw handleDatabaseException("Got DatabaseException on commit", de);
+ handleCommitException(tx, de);
}
return _committer.commitAsync(tx, val);
}
@@ -441,4 +440,16 @@ public class StandardEnvironmentFacade i
cachedHandle.close();
}
}
+
+ private void handleCommitException(final Transaction tx, RuntimeException e)
+ {
+ if (e instanceof IllegalStateException && !tx.isValid())
+ {
+ throw new ConnectionScopedRuntimeException("Commit aborted", e);
+ }
+ else
+ {
+ throw handleDatabaseException("Commit failed", e);
+ }
+ }
}
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1725569&r1=1725568&r2=1725569&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java Tue Jan 19 17:14:04 2016
@@ -279,9 +279,9 @@ public class ReplicatedEnvironmentFacade
// the HA durability configuration to influence resulting behaviour.
tx.commit(_realMessageStoreDurability);
}
- catch (DatabaseException de)
+ catch (RuntimeException de)
{
- throw handleDatabaseException("Got DatabaseException on commit, closing environment", de);
+ handleCommitException(tx, de);
}
if (_coalescingCommiter != null && _realMessageStoreDurability.getLocalSync() == SyncPolicy.NO_SYNC
@@ -301,9 +301,9 @@ public class ReplicatedEnvironmentFacade
// the HA durability configuration to influence resulting behaviour.
tx.commit(_realMessageStoreDurability);
}
- catch (DatabaseException de)
+ catch (RuntimeException de)
{
- throw handleDatabaseException("Got DatabaseException on commit, closing environment", de);
+ handleCommitException(tx, de);
}
if (_coalescingCommiter != null && _realMessageStoreDurability.getLocalSync() == SyncPolicy.NO_SYNC
@@ -1823,6 +1823,18 @@ public class ReplicatedEnvironmentFacade
}
}
+ private void handleCommitException(final Transaction tx, RuntimeException e)
+ {
+ if (e instanceof IllegalStateException && !tx.isValid())
+ {
+ throw new ConnectionScopedRuntimeException("Commit aborted", e);
+ }
+ else
+ {
+ throw handleDatabaseException("Commit failed", e);
+ }
+ }
+
private class RemoteNodeStateLearner implements Callable<Void>
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org