inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Alfresco/InsightEngine into fix/SEARCH-2400

Browse Source
This commit is contained in:
elia
2020-09-10 11:21:37 +02:00
parent a0edcc6922 6afa3a2568
commit 415b62cb39
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+2
View File
@@ -1435,6 +1435,8 @@ public class SolrInformationServer implements InformationServer
long timeBeforeWhichThereCanBeNoChangeSetHolesInIndex = state.getLastIndexedChangeSetCommitTime() - holeRetention;
state.setLastGoodChangeSetCommitTimeInIndex(timeBeforeWhichThereCanBeNoChangeSetHolesInIndex > 0 ? timeBeforeWhichThereCanBeNoChangeSetHolesInIndex : 0);
LOGGER.debug("The tracker initial state was created: " + state);
return state;
}
}
search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AclTracker.java
+11 -1
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 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;
@@ -128,6 +131,12 @@ public class AclTracker extends ActivatableTracker
super(p, client, coreName, informationServer, Tracker.Type.ACL);
changeSetAclsBatchSize = Integer.parseInt(p.getProperty("alfresco.changeSetAclsBatchSize",
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",
String.valueOf(DEFAULT_ACL_BATCH_SIZE)));
docRouter = DocRouterFactory.getRouter(p, shardMethod);
@@ -749,7 +758,7 @@ public class AclTracker extends ActivatableTracker
Collection<List<AclChangeSet>> changeSetBatches = aclChangeSets.getAclChangeSets().stream()
.peek(changeSetsFound::add)
.filter(this::isAclChangeSetAlreadyIndexed)
.collect(Collectors.groupingBy(it -> counter.getAndAdd(it.getAclCount()) / changeSetAclsBatchSize))
.collect(Collectors.groupingBy(it -> counter.getAndAdd(1) / changeSetAclsBatchSize))
.values();
@@ -763,6 +772,7 @@ public class AclTracker extends ActivatableTracker
long endElapsed = System.nanoTime();
trackerStats.addElapsedAclTime(aclCount, endElapsed-startElapsed);
startElapsed = endElapsed;
totalAclCount += aclCount;
}
}
search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java
+1 -1
View File
@@ -157,7 +157,7 @@ public class AlfrescoIndexingStatePersistenceAcrossReloadsIT extends AbstractAlf
}
indexTransaction(bigTxn2, nodes, nodeMetaDatas);
waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 100000);
waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 150000);
}
private void reloadAndAssertCorrect(Collection<Tracker> trackers, int numOfTrackers, int jobs) throws Exception
search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class AlfrescoSolrReloadIT extends AbstractAlfrescoSolrIT
indexTransaction(bigTxn2, nodes, nodeMetaDatas);
waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 100000);
waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 150000);
}
private void reloadAndAssertCorrect(Collection<Tracker> trackers, int numOfTrackers, int jobs) throws Exception