inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unreported error: New transactions started in the post-commit phase *might* see stale cache data

Browse Source 
- Transactional caches were flushing last in the post-commit phase
 - New transactions in the post-commit phase would see cache data out of synch with the DB-committed data
 - Affects DOD5015 post-commit audit actions, which were not generating full datasets for the first-pass data import

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-09-30 15:41:37 +00:00
parent 8a1a86dc0f
commit 77457e3670
3 changed files with 172 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/java/org/alfresco/repo/cache/CacheTest.java vendored
View File

@@ -169,6 +169,7 @@ public class CacheTest extends TestCase
String newGlobalTwo = "new_global_two";
String newGlobalThree = "new_global_three";
String updatedTxnThree = "updated_txn_three";
String updatedTxnFour = "updated_txn_four";
// add item to global cache
backingCache.put(newGlobalOne, newGlobalOne);
@@ -198,17 +199,25 @@ public class CacheTest extends TestCase
assertFalse("Transactionally removed item found in keys", transactionalKeys.contains(newGlobalOne));
assertTrue("Transactionally added item not found in keys", transactionalKeys.contains(updatedTxnThree));
// Register a post-commit stresser. We do this here so that it is registered after the transactional cache
PostCommitCacheUser listener = new PostCommitCacheUser(transactionalCache, updatedTxnThree);
AlfrescoTransactionSupport.bindListener(listener);
// Register a post-commit cache reader to make sure that nothing blows up if the cache is hit in post-commit
PostCommitCacheReader listenerReader = new PostCommitCacheReader(transactionalCache, updatedTxnThree);
AlfrescoTransactionSupport.bindListener(listenerReader);
// Register a post-commit cache reader to make sure that nothing blows up if the cache is hit in post-commit
PostCommitCacheWriter listenerWriter = new PostCommitCacheWriter(transactionalCache, updatedTxnFour, "FOUR");
AlfrescoTransactionSupport.bindListener(listenerWriter);
// commit the transaction
txn.commit();
// Check the post-commit stresser
if (listener.e != null)
// Check the post-commit stressers
if (listenerReader.e != null)
{
throw listener.e;
throw listenerReader.e;
}
if (listenerWriter.e != null)
{
throw listenerWriter.e;
}
// check that backing cache was updated with the in-transaction changes
@@ -231,18 +240,18 @@ public class CacheTest extends TestCase
}
/**
* This transaction listener attempts to use the cache in the afterCommit phase. Technically the
* This transaction listener attempts to read from the cache in the afterCommit phase. Technically the
* transaction has finished, but the transaction resources are still available.
*
* @author Derek Hulley
* @since 2.1
*/
private class PostCommitCacheUser extends TransactionListenerAdapter
private class PostCommitCacheReader extends TransactionListenerAdapter
{
private final SimpleCache<String, Object> transactionalCache;
private final String key;
private Throwable e;
private PostCommitCacheUser(SimpleCache<String, Object> transactionalCache, String key)
private PostCommitCacheReader(SimpleCache<String, Object> transactionalCache, String key)
{
this.transactionalCache = transactionalCache;
this.key = key;
@@ -260,12 +269,42 @@ public class CacheTest extends TestCase
return;
}
}
@Override
public int hashCode()
{
return -100000;
}
/**
* This transaction listener attempts to write to the cache in the afterCommit phase. Technically the
* transaction has finished, but the transaction resources are still available.
*
* @author Derek Hulley
* @since 2.1
*/
private class PostCommitCacheWriter extends TransactionListenerAdapter
{
private final SimpleCache<String, Object> transactionalCache;
private final String key;
private final Object value;
private Throwable e;
private PostCommitCacheWriter(SimpleCache<String, Object> transactionalCache, String key, Object value)
{
this.transactionalCache = transactionalCache;
this.key = key;
this.value = value;
}
@Override
public void afterCommit()
{
try
{
transactionalCache.put(key, value);
transactionalCache.remove(key);
transactionalCache.clear();
}
catch (Throwable e)
{
this.e = e;
return;
}
}
}
/**

38
source/java/org/alfresco/repo/cache/TransactionalCache.java vendored
View File

@@ -123,7 +123,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
{
return false;
}
if (!(obj instanceof TransactionalCache))
if (!(obj instanceof TransactionalCache<?, ?>))
{
return false;
}
@@ -396,9 +396,18 @@ public class TransactionalCache<K extends Serializable, V extends Object>
// Ensure that the cache isn't being modified
if (txnData.isClosed)
{
throw new AlfrescoRuntimeException("onCommit cache modifications are not allowed.");
if (isDebugEnabled)
{
logger.debug(
"In post-commit add: \n" +
" cache: " + this + "\n" +
" key: " + key + "\n" +
" value: " + value);
}
// we have a transaction - add the item into the updated cache for this transaction
}
else
{
// we have an active transaction - add the item into the updated cache for this transaction
// are we in an overflow condition?
if (txnData.updatedItemsCache.getMemoryStoreSize() >= maxCacheSize)
{
@@ -433,6 +442,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
}
}
}
}
/**
* Goes direct to the shared cache in the absence of a transaction.
@@ -461,8 +471,16 @@ public class TransactionalCache<K extends Serializable, V extends Object>
// Ensure that the cache isn't being modified
if (txnData.isClosed)
{
throw new AlfrescoRuntimeException("onCommit cache modifications are not allowed.");
if (isDebugEnabled)
{
logger.debug(
"In post-commit remove: \n" +
" cache: " + this + "\n" +
" key: " + key);
}
}
else
{
// is the shared cache going to be cleared?
if (txnData.isClearOn)
{
@@ -511,6 +529,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
}
}
}
}
/**
* Clears out all the caches.
@@ -531,8 +550,15 @@ public class TransactionalCache<K extends Serializable, V extends Object>
// Ensure that the cache isn't being modified
if (txnData.isClosed)
{
throw new AlfrescoRuntimeException("onCommit cache modifications are not allowed.");
if (isDebugEnabled)
{
logger.debug(
"In post-commit clear: \n" +
" cache: " + this);
}
}
else
{
// the shared cache must be cleared at the end of the transaction
// and also serves to ensure that the shared cache will be ignored
// for the remainder of the transaction
@@ -540,6 +566,7 @@ public class TransactionalCache<K extends Serializable, V extends Object>
txnData.updatedItemsCache.removeAll();
txnData.removedItemsCache.removeAll();
}
}
else // no transaction
{
if (isDebugEnabled)
@@ -568,7 +595,6 @@ public class TransactionalCache<K extends Serializable, V extends Object>
/**
* NO-OP
*/
@SuppressWarnings("unchecked")
public void beforeCommit(boolean readOnly)
{
}

40
source/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
View File

@@ -778,6 +778,26 @@ public abstract class AlfrescoTransactionSupport
logger.debug("After completion (" + statusStr + "): " + this);
}
// Clean up the transactional caches
for (TransactionalCache<Serializable, Object> cache : transactionalCaches)
{
try
{
if (status == TransactionSynchronization.STATUS_COMMITTED)
{
cache.afterCommit();
}
else
{
cache.afterRollback();
}
}
catch (RuntimeException e)
{
logger.error("After completion (" + statusStr + ") TransactionalCache exception", e);
}
}
List<TransactionListener> iterableListeners = getListenersIterable();
// notify listeners
if (status == TransactionSynchronization.STATUS_COMMITTED)
@@ -833,26 +853,6 @@ public abstract class AlfrescoTransactionSupport
}
}
// Clean up the transactional caches
for (TransactionalCache<Serializable, Object> cache : transactionalCaches)
{
try
{
if (status == TransactionSynchronization.STATUS_COMMITTED)
{
cache.afterCommit();
}
else
{
cache.afterRollback();
}
}
catch (RuntimeException e)
{
logger.error("After completion (" + statusStr + ") TransactionalCache exception", e);
}
}
// clear the thread's registrations and synchronizations
AlfrescoTransactionSupport.clearSynchronization();
}