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/25 17:48:11 UTC
svn commit: r1726653 - in
/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb:
StandardEnvironmentFacade.java replication/ReplicatedEnvironmentFacade.java
Author: orudyy
Date: Mon Jan 25 16:48:10 2016
New Revision: 1726653
URL: http://svn.apache.org/viewvc?rev=1726653&view=rev
Log:
QPID-6999: Revert changes to transaction exception handling as other changes made in QPID-6997 restart virtual host on JE environment restart which closes all the connections/sessions and their transactions preventing the original JIRA issue from occurance
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=1726653&r1=1726652&r2=1726653&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 Mon Jan 25 16:48:10 2016
@@ -53,7 +53,6 @@ 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
{
@@ -159,12 +158,13 @@ public class StandardEnvironmentFacade i
{
tx.commitNoSync();
}
- catch (RuntimeException de)
+ catch (DatabaseException de)
{
LOGGER.error("Got DatabaseException on commit, closing environment", de);
closeEnvironmentSafely();
- handleCommitException(tx, de);
+
+ throw handleDatabaseException("Got DatabaseException on commit", de);
}
_committer.commit(tx, syncCommit);
}
@@ -176,12 +176,13 @@ public class StandardEnvironmentFacade i
{
tx.commitNoSync();
}
- catch (RuntimeException de)
+ catch (DatabaseException de)
{
LOGGER.error("Got DatabaseException on commit, closing environment", de);
closeEnvironmentSafely();
- handleCommitException(tx, de);
+
+ throw handleDatabaseException("Got DatabaseException on commit", de);
}
return _committer.commitAsync(tx, val);
}
@@ -497,16 +498,4 @@ 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=1726653&r1=1726652&r2=1726653&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 Mon Jan 25 16:48:10 2016
@@ -294,9 +294,9 @@ public class ReplicatedEnvironmentFacade
// the HA durability configuration to influence resulting behaviour.
tx.commit(_realMessageStoreDurability);
}
- catch (RuntimeException de)
+ catch (DatabaseException de)
{
- handleCommitException(tx, de);
+ throw handleDatabaseException("Got DatabaseException on commit, closing environment", de);
}
if (_coalescingCommiter != null && _realMessageStoreDurability.getLocalSync() == SyncPolicy.NO_SYNC
@@ -316,9 +316,9 @@ public class ReplicatedEnvironmentFacade
// the HA durability configuration to influence resulting behaviour.
tx.commit(_realMessageStoreDurability);
}
- catch (RuntimeException de)
+ catch (DatabaseException de)
{
- handleCommitException(tx, de);
+ throw handleDatabaseException("Got DatabaseException on commit, closing environment", de);
}
if (_coalescingCommiter != null && _realMessageStoreDurability.getLocalSync() == SyncPolicy.NO_SYNC
@@ -1973,18 +1973,6 @@ 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