Author: orudyy
Date: Thu Jan 22 10:52:14 2015
New Revision: 1653808
URL: http://svn.apache.org/r1653808
Log:
QPID-6333: [Java Broker] Upgrade BDB JE version to 5.0.104
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
qpid/trunk/qpid/java/pom.xml
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java?rev=1653808&r1=1653807&r2=1653808&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
Thu Jan 22 10:52:14 2015
@@ -392,6 +392,13 @@ public class ReplicatedEnvironmentFacade
}
}
+ if (dbe instanceof UnknownMasterException)
+ {
+ // when Master transits into Unknown state ( for example, due
to mastership transfer)
+ // we need to abort any ongoing je operation without halting
the Broker or VHN/VH
+ return new
ConnectionScopedRuntimeException(String.format("Environment '%s' cannot finish
JE operation because master is unknown", getNodeName()), dbe);
+ }
+
boolean restart = (noMajority || dbe instanceof
RestartRequiredException);
if (restart)
{
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1653808&r1=1653807&r2=1653808&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Thu Jan 22 10:52:14 2015
@@ -636,12 +636,6 @@ public class BDBHAVirtualHostNodeImpl ex
createReplicaVirtualHost();
}
-
- private void onDetached()
- {
- closeVirtualHostIfExist();
- }
-
private void createReplicaVirtualHost()
{
try
@@ -693,9 +687,10 @@ public class BDBHAVirtualHostNodeImpl ex
onReplica();
break;
case DETACHED:
- onDetached();
+ closeVirtualHostIfExist();
break;
case UNKNOWN:
+ closeVirtualHostIfExist();
break;
default:
LOGGER.error("Unexpected state change: " + state);
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java?rev=1653808&r1=1653807&r2=1653808&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
Thu Jan 22 10:52:14 2015
@@ -803,7 +803,7 @@ public class ReplicatedEnvironmentFacade
_replicaRolledback.countDown();
}
});
- assertTrue("Node 1 did not go into desired state",
+ assertTrue("Node 1 did not go into desired state and remained in state
" + node1.getNodeState(),
node1StateChangeListener.awaitForStateChange(LISTENER_TIMEOUT,
TimeUnit.SECONDS));
assertTrue("Node 1 did not experience rollback within timeout",
_replicaRolledback.await(LISTENER_TIMEOUT,
TimeUnit.SECONDS));
Modified: qpid/trunk/qpid/java/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1653808&r1=1653807&r2=1653808&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Thu Jan 22 10:52:14 2015
@@ -73,6 +73,7 @@
<profile.broker.clean.between.tests>true</profile.broker.clean.between.tests>
<dollar.sign>$</dollar.sign>
<at.sign>@</at.sign>
+ <bdb-version>5.0.104</bdb-version>
</properties>
<modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
