You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/03/14 17:37:43 UTC
svn commit: r1786941 - in /qpid/java/branches/6.1.x: ./
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
Author: kwall
Date: Tue Mar 14 17:37:42 2017
New Revision: 1786941
URL: http://svn.apache.org/viewvc?rev=1786941&view=rev
Log:
QPID-7685: QPID-7701: [BDB] Remove possibility of a lock timeout during message instance recovery by reading uncommitted data.
Merged from trunk with command:
svn merge -c 1786914 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 14 17:37:42 2017
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1786188-1786189,1786342,1786657,1786690,1786723,1786923
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1786941&r1=1786940&r2=1786941&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Tue Mar 14 17:37:42 2017
@@ -412,36 +412,22 @@ public abstract class AbstractBDBMessage
private void visitMessagesInternal(MessageHandler handler, EnvironmentFacade environmentFacade)
{
+ DatabaseEntry key = new DatabaseEntry();
+ DatabaseEntry value = new DatabaseEntry();
+ MessageMetaDataBinding valueBinding = MessageMetaDataBinding.getInstance();
+
try(Cursor cursor = getMessageMetaDataDb().openCursor(null, null))
{
- DatabaseEntry key = new DatabaseEntry();
- DatabaseEntry value = new DatabaseEntry();
- MessageMetaDataBinding valueBinding = MessageMetaDataBinding.getInstance();
-
- int attempts = 0;
- boolean completed = false;
- do
+ while (cursor.getNext(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS)
{
- try
- {
- while (cursor.getNext(key, value, LockMode.RMW) == OperationStatus.SUCCESS)
- {
- long messageId = LongBinding.entryToLong(key);
- StorableMessageMetaData metaData = valueBinding.entryToObject(value);
- StoredBDBMessage message = new StoredBDBMessage(messageId, metaData, true);
- if (!handler.handle(message))
- {
- break;
- }
- }
- completed = true;
- }
- catch (LockConflictException e)
+ long messageId = LongBinding.entryToLong(key);
+ StorableMessageMetaData metaData = valueBinding.entryToObject(value);
+ StoredBDBMessage message = new StoredBDBMessage(messageId, metaData, true);
+ if (!handler.handle(message))
{
- sleepOrThrowOnLockConflict(attempts++, "Cannot visit messages", e);
+ break;
}
}
- while (!completed);
}
catch (RuntimeException e)
{
@@ -1494,56 +1480,42 @@ public abstract class AbstractBDBMessage
checkMessageStoreOpen();
final List<QueueEntryKey> entries = new ArrayList<>();
- try
+ try(Cursor cursor = getDeliveryDb().openCursor(null, null))
{
- int attempts = 0;
- boolean completed = false;
- do
- {
- try(Cursor cursor = getDeliveryDb().openCursor(null, null))
- {
- boolean searchCompletedSuccessfully = false;
- entries.clear();
+ boolean searchCompletedSuccessfully = false;
- DatabaseEntry key = new DatabaseEntry();
- DatabaseEntry value = new DatabaseEntry();
- value.setPartial(0, 0, true);
+ DatabaseEntry key = new DatabaseEntry();
+ DatabaseEntry value = new DatabaseEntry();
+ value.setPartial(0, 0, true);
- QueueEntryBinding keyBinding = QueueEntryBinding.getInstance();
- keyBinding.objectToEntry(new QueueEntryKey(queue.getId(),0l), key);
+ QueueEntryBinding keyBinding = QueueEntryBinding.getInstance();
+ keyBinding.objectToEntry(new QueueEntryKey(queue.getId(), 0l), key);
- if (!searchCompletedSuccessfully && (searchCompletedSuccessfully = cursor.getSearchKeyRange(key,value, LockMode.DEFAULT) == OperationStatus.SUCCESS))
+ if (!searchCompletedSuccessfully && (searchCompletedSuccessfully =
+ cursor.getSearchKeyRange(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS))
+ {
+ QueueEntryKey entry = keyBinding.entryToObject(key);
+ if (entry.getQueueId().equals(queue.getId()))
+ {
+ entries.add(entry);
+ }
+ }
+
+ if (searchCompletedSuccessfully)
+ {
+ while (cursor.getNext(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS)
+ {
+ QueueEntryKey entry = keyBinding.entryToObject(key);
+ if (entry.getQueueId().equals(queue.getId()))
{
- QueueEntryKey entry = keyBinding.entryToObject(key);
- if(entry.getQueueId().equals(queue.getId()))
- {
- entries.add(entry);
- }
+ entries.add(entry);
}
-
- if (searchCompletedSuccessfully)
+ else
{
- while(cursor.getNext(key, value, LockMode.DEFAULT) == OperationStatus.SUCCESS)
- {
- QueueEntryKey entry = keyBinding.entryToObject(key);
- if(entry.getQueueId().equals(queue.getId()))
- {
- entries.add(entry);
- }
- else
- {
- break;
- }
- }
+ break;
}
- completed = true;
- }
- catch (LockConflictException e)
- {
- sleepOrThrowOnLockConflict(attempts++, "Cannot visit message instances", e);
}
}
- while (!completed);
}
catch (RuntimeException e)
{
@@ -1577,7 +1549,7 @@ public abstract class AbstractBDBMessage
DatabaseEntry value = new DatabaseEntry();
value.setPartial(0, 0, true);
- while (cursor.getNext(key, value, LockMode.DEFAULT) == OperationStatus.SUCCESS)
+ while (cursor.getNext(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS)
{
QueueEntryKey entry = keyBinding.entryToObject(key);
entries.add(entry);
@@ -1612,7 +1584,7 @@ public abstract class AbstractBDBMessage
PreparedTransactionBinding valueBinding = new PreparedTransactionBinding();
DatabaseEntry value = new DatabaseEntry();
- while (cursor.getNext(key, value, LockMode.RMW) == OperationStatus.SUCCESS)
+ while (cursor.getNext(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS)
{
Xid xid = keyBinding.entryToObject(key);
PreparedTransaction preparedTransaction = valueBinding.entryToObject(value);
@@ -1622,7 +1594,6 @@ public abstract class AbstractBDBMessage
break;
}
}
-
}
catch (RuntimeException e)
{
Modified: qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1786941&r1=1786940&r2=1786941&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java (original)
+++ qpid/java/branches/6.1.x/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java Tue Mar 14 17:37:42 2017
@@ -227,14 +227,14 @@ public class BDBConfigurationStore imple
private Collection<? extends ConfiguredObjectRecord> doVisitAllConfiguredObjectRecords()
{
- Map<UUID, BDBConfiguredObjectRecord> configuredObjects = new HashMap<UUID, BDBConfiguredObjectRecord>();
+ Map<UUID, BDBConfiguredObjectRecord> configuredObjects = new HashMap<>();
try(Cursor objectsCursor = getConfiguredObjectsDb().openCursor(null, null))
{
DatabaseEntry key = new DatabaseEntry();
DatabaseEntry value = new DatabaseEntry();
- while (objectsCursor.getNext(key, value, LockMode.RMW) == OperationStatus.SUCCESS)
+ while (objectsCursor.getNext(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS)
{
UUID id = UUIDTupleBinding.getInstance().entryToObject(key);
@@ -246,7 +246,7 @@ public class BDBConfigurationStore imple
// set parents
try(Cursor hierarchyCursor = getConfiguredObjectHierarchyDb().openCursor(null, null))
{
- while (hierarchyCursor.getNext(key, value, LockMode.RMW) == OperationStatus.SUCCESS)
+ while (hierarchyCursor.getNext(key, value, LockMode.READ_UNCOMMITTED) == OperationStatus.SUCCESS)
{
HierarchyKey hk = HierarchyKeyBinding.getInstance().entryToObject(key);
UUID parentId = UUIDTupleBinding.getInstance().entryToObject(value);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org