mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V2.9 to HEAD
9018: MT: system-wide jobs should run across all stores/indexes
9204: Merged V2.2 to V2.9
8633: Merged V2.1 to V2.2
8629: Merged V2.1-A to V2.1
8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
8494: EHCache and JGroup patches and upgrades
8546: ACT-1650: performance optimization
8550: Fixes to transactional cache handling
8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
8640: Merged V2.1 to V2.2
8638: Used correct exception type for IO channel reopen logic
9102: Unit test to check that transactional cache size overrun is handled
9106: Merged V2.1 to V2.2
9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
9049: Fix patches to only run once
9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
9061: Fixed NodeRefPropertyMethodInterceptorTest
9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
9080: Fixed EHCache source zip
9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
9206: Merged V2.2 to V2.9
8857: Improvements to ACL performance for large ACLs
8951: Always check permission entry changes are made at position 0
9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
9220: Added delete permission check when marking a file for delete on close. Port of r9075.
9222: Merged V2.1 to V2.9
8683: Early warning for nodes indexed in the wrong store (ACT-964)
8684: Enhanced tests
8685: Enhanced tests
8686: Additional tests
9223: Merged V2.2 to V2.9
9120: Merged V2.1 to V2.2
8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
9122: Additional unit test from support case.
9224: Merged V2.2 to V2.9
9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
9104: Merged V2.1 to V2.2
9025: Fixed AR-2314, AR-2299: Optimizations after profiling
9105: Merged V2.1 to V2.2
8745: Fix AR-2233 (regression introduced by fix for AR-2221)
9121: Merged V2.1 to V2.2
9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
9225: Merged V2.1 to V2.9
8641: Merged V2.1-A to V2.1
7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
8682: Fix for AR-2005
8695: AR-2054.
8696: Improved sort test to include prefix form of field name
9226: Fix ALFCOM-994 (see also earlier change in r9223)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -26,11 +26,13 @@ package org.alfresco.repo.node.index;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.i18n.I18NUtil;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.repo.domain.Transaction;
|
||||
import org.alfresco.repo.node.index.IndexTransactionTracker.IndexTransactionTrackerListener;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
@@ -52,6 +54,9 @@ import org.apache.commons.logging.LogFactory;
|
||||
public class FullIndexRecoveryComponent extends AbstractReindexComponent
|
||||
{
|
||||
private static final String ERR_INDEX_OUT_OF_DATE = "index.recovery.out_of_date";
|
||||
private static final String MSG_TRACKING_STARTING = "index.tracking.starting";
|
||||
private static final String MSG_TRACKING_COMPLETE = "index.tracking.complete";
|
||||
private static final String MSG_TRACKING_PROGRESS = "index.tracking.progress";
|
||||
private static final String MSG_RECOVERY_STARTING = "index.recovery.starting";
|
||||
private static final String MSG_RECOVERY_COMPLETE = "index.recovery.complete";
|
||||
private static final String MSG_RECOVERY_PROGRESS = "index.recovery.progress";
|
||||
@@ -190,8 +195,7 @@ public class FullIndexRecoveryComponent extends AbstractReindexComponent
|
||||
}
|
||||
else if (!endAllPresent)
|
||||
{
|
||||
// Trigger the tracker, which will top up the indexes
|
||||
indexTracker.reindex();
|
||||
performPartialRecovery();
|
||||
}
|
||||
break;
|
||||
case VALIDATE:
|
||||
@@ -215,6 +219,43 @@ public class FullIndexRecoveryComponent extends AbstractReindexComponent
|
||||
|
||||
}
|
||||
|
||||
private void performPartialRecovery()
|
||||
{
|
||||
// Log the AUTO recovery
|
||||
IndexTransactionTrackerListener trackerListener = new IndexTransactionTrackerListener()
|
||||
{
|
||||
long lastLogged = 0L;
|
||||
public void indexedTransactions(long fromTimeInclusive, long toTimeExclusive)
|
||||
{
|
||||
long now = System.currentTimeMillis();
|
||||
if (now - lastLogged < 10000L)
|
||||
{
|
||||
// Don't log more than once a minute
|
||||
return;
|
||||
}
|
||||
lastLogged = now;
|
||||
// Log it
|
||||
Date toTimeDate = new Date(toTimeExclusive);
|
||||
String msgAutoProgress = I18NUtil.getMessage(MSG_TRACKING_PROGRESS, toTimeDate.toString());
|
||||
logger.info(msgAutoProgress);
|
||||
}
|
||||
};
|
||||
try
|
||||
{
|
||||
// Register the listener
|
||||
indexTracker.setListener(trackerListener);
|
||||
// Trigger the tracker, which will top up the indexes
|
||||
logger.info(I18NUtil.getMessage(MSG_TRACKING_STARTING));
|
||||
indexTracker.reindex();
|
||||
logger.info(I18NUtil.getMessage(MSG_TRACKING_COMPLETE));
|
||||
}
|
||||
finally
|
||||
{
|
||||
// Remove the listener
|
||||
indexTracker.setListener(null);
|
||||
}
|
||||
}
|
||||
|
||||
private static final int MAX_TRANSACTIONS_PER_ITERATION = 1000;
|
||||
private void performFullRecovery()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user