mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.9 to HEAD
9845: Merged V2.2 to V2.9 9733: Merged V2.1 to V2.2 9281: Improvements to index AUTO recovery 9316: Fixed ETWOONE-193: Transactional caches not being cleaned up after rollback (2.1.4 regression) 9317: Fixed ETWOONE-194: Faster void handling during index tracking 9365: Improved performance for finding which snapshots have been indexed 9413: Support to retrieve read/write state of the transaction and ensure Lucene commits are handled last 9414: ACT-3245: Updating node properties and aspects don't bump the alf_node.version value 9415: Code cleanup: Removed unnecessary empty methods 9416: Fixed creation of multiple thread pools 9417: Full index recovery absorbs indexing exceptions by default 9418: Added AUTO index recovery option to sample in line with Wiki docs 9419: ETWOONE-194: Index tracking is too slow 9420: Fixed ETWOONE-201: Better logging and configurability for RetryingTransactionHelper 9421: Fixed ETWOONE-202: SPlit person cleanup doesn't break read-only transactions 9422: Follow up on CHK-3317: Removed use of JDK 1.6 NavigableMap interface 9423: Fixed unit test after CHK-3317 9424: More test fixes after CHK-3317 9425: Ensure that index tracking tests don't run too long. 9426: Made concurrent reindexing optional. It is on by default. 9509: ACT-3539: Mid-transaction locking on Lucene resources 9547: Multithreaded index tracking startup: Handle previously lagging single-threaded rebuilds git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
*/
|
||||
package org.alfresco.repo.node.index;
|
||||
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
@@ -52,6 +54,7 @@ public class IndexTransactionTrackerTest extends TestCase
|
||||
private AuthenticationComponent authenticationComponent;
|
||||
private SearchService searchService;
|
||||
private NodeService nodeService;
|
||||
private ThreadPoolExecutor threadPoolExecutor;
|
||||
private FileFolderService fileFolderService;
|
||||
private ContentStore contentStore;
|
||||
private FullTextSearchIndexer ftsIndexer;
|
||||
@@ -65,6 +68,7 @@ public class IndexTransactionTrackerTest extends TestCase
|
||||
ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
|
||||
searchService = serviceRegistry.getSearchService();
|
||||
nodeService = serviceRegistry.getNodeService();
|
||||
threadPoolExecutor = (ThreadPoolExecutor) ctx.getBean("indexTrackerThreadPoolExecutor");
|
||||
fileFolderService = serviceRegistry.getFileFolderService();
|
||||
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
|
||||
contentStore = (ContentStore) ctx.getBean("fileContentStore");
|
||||
@@ -79,6 +83,7 @@ public class IndexTransactionTrackerTest extends TestCase
|
||||
indexTracker.setIndexer(indexer);
|
||||
indexTracker.setNodeDaoService(nodeDaoService);
|
||||
indexTracker.setNodeService(nodeService);
|
||||
indexTracker.setThreadPoolExecutor(threadPoolExecutor);
|
||||
indexTracker.setSearcher(searchService);
|
||||
indexTracker.setTransactionService((TransactionServiceImpl)transactionService);
|
||||
|
||||
@@ -118,7 +123,19 @@ public class IndexTransactionTrackerTest extends TestCase
|
||||
|
||||
public synchronized void testStartup() throws Exception
|
||||
{
|
||||
indexTracker.reindex();
|
||||
indexTracker.reindex();
|
||||
Thread reindexThread = new Thread()
|
||||
{
|
||||
public void run()
|
||||
{
|
||||
indexTracker.reindex();
|
||||
indexTracker.reindex();
|
||||
}
|
||||
};
|
||||
reindexThread.setDaemon(true);
|
||||
reindexThread.start();
|
||||
// wait a bit and then terminate
|
||||
wait(20000);
|
||||
indexTracker.setShutdown(true);
|
||||
wait(20000);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user