inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-08 14:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #926 from Alfresco/fix/SEARCH-2408_ChangeSetAclsBatchSizeLimit

Browse Source 
SEARCH-2408: Hard limit to 512 ACL Change Set lists to get informatio…
This commit is contained in:
Angel Borroy
2020-09-08 15:02:41 +02:00
committed by GitHub
parent 98b6a77477 a5d1460d0a
commit bf46b49c9c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AclTracker.java
View File

@@ -81,6 +81,9 @@ public class AclTracker extends ActivatableTracker
private static final int MAX_NUMBER_OF_ACL_CHANGE_SETS = 2000; private static final int MAX_NUMBER_OF_ACL_CHANGE_SETS = 2000;
private static final long MAX_TIME_STEP = TIME_STEP_32_DAYS_IN_MS; private static final long MAX_TIME_STEP = TIME_STEP_32_DAYS_IN_MS;
// Repository Remote API doesn't accept more than 512 aclChangeSetIds by invocation
private static final int MAX_ACL_CHANGE_SET_BATCH_SIZE = 512;
private int aclTrackerParallelism; private int aclTrackerParallelism;
@@ -128,6 +131,12 @@ public class AclTracker extends ActivatableTracker
super(p, client, coreName, informationServer, Tracker.Type.ACL); super(p, client, coreName, informationServer, Tracker.Type.ACL);
changeSetAclsBatchSize = Integer.parseInt(p.getProperty("alfresco.changeSetAclsBatchSize", changeSetAclsBatchSize = Integer.parseInt(p.getProperty("alfresco.changeSetAclsBatchSize",
String.valueOf(DEFAULT_CHANGE_SET_ACLS_BATCH_SIZE))); String.valueOf(DEFAULT_CHANGE_SET_ACLS_BATCH_SIZE)));
if (changeSetAclsBatchSize > MAX_ACL_CHANGE_SET_BATCH_SIZE)
{
LOGGER.warn("Max value for 'alfresco.changeSetAclsBatchSize' is 512. "
+ "This value is being taken instead of the one specified in 'solrcore.properties': " + changeSetAclsBatchSize);
changeSetAclsBatchSize = MAX_ACL_CHANGE_SET_BATCH_SIZE;
}
aclBatchSize = Integer.parseInt(p.getProperty("alfresco.aclBatchSize", aclBatchSize = Integer.parseInt(p.getProperty("alfresco.aclBatchSize",
String.valueOf(DEFAULT_ACL_BATCH_SIZE))); String.valueOf(DEFAULT_ACL_BATCH_SIZE)));
docRouter = DocRouterFactory.getRouter(p, shardMethod); docRouter = DocRouterFactory.getRouter(p, shardMethod);
@@ -749,7 +758,7 @@ public class AclTracker extends ActivatableTracker
Collection<List<AclChangeSet>> changeSetBatches = aclChangeSets.getAclChangeSets().stream() Collection<List<AclChangeSet>> changeSetBatches = aclChangeSets.getAclChangeSets().stream()
.peek(changeSetsFound::add) .peek(changeSetsFound::add)
.filter(this::isAclChangeSetAlreadyIndexed) .filter(this::isAclChangeSetAlreadyIndexed)
.collect(Collectors.groupingBy(it -> counter.getAndAdd(it.getAclCount()) / changeSetAclsBatchSize)) .collect(Collectors.groupingBy(it -> counter.getAndAdd(1) / changeSetAclsBatchSize))
.values(); .values();
@@ -763,6 +772,7 @@ public class AclTracker extends ActivatableTracker
long endElapsed = System.nanoTime(); long endElapsed = System.nanoTime();
trackerStats.addElapsedAclTime(aclCount, endElapsed-startElapsed); trackerStats.addElapsedAclTime(aclCount, endElapsed-startElapsed);
startElapsed = endElapsed; startElapsed = endElapsed;
totalAclCount += aclCount;
} }
} }