From f93e979ed903146c19d98ae6bec8891070a49ca3 Mon Sep 17 00:00:00 2001 From: Angel Borroy Date: Wed, 19 Feb 2020 11:43:11 +0100 Subject: [PATCH] SEARCH-2117: Revert limit to 2000l for checking first transactions in database when checking the index and fix Integration Test. --- .../java/org/alfresco/solr/tracker/MetadataTracker.java | 8 ++++---- .../test/java/org/alfresco/solr/AlfrescoSolrUtils.java | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java index 7c00a936c..9fde7061f 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java @@ -243,7 +243,7 @@ public class MetadataTracker extends CoreStatePublisher implements Tracker state.setCheckedFirstTransactionTime(true); log.info("No transactions found - no verification required"); - firstTransactions = client.getTransactions(null, 0L, null, Long.MAX_VALUE, 1); + firstTransactions = client.getTransactions(null, 0L, null, 2000l, 1); if (!firstTransactions.getTransactions().isEmpty()) { Transaction firstTransaction = firstTransactions.getTransactions().get(0); @@ -278,7 +278,7 @@ public class MetadataTracker extends CoreStatePublisher implements Tracker } } - firstTransactions = client.getTransactions(minCommitTime, 0L, null, Long.MAX_VALUE, 1); + firstTransactions = client.getTransactions(minCommitTime, 0L, null, 2000l, 1); if (!firstTransactions.getTransactions().isEmpty()) { Transaction firstTransaction = firstTransactions.getTransactions().get(0); @@ -311,7 +311,7 @@ public class MetadataTracker extends CoreStatePublisher implements Tracker { if (firstTransactions == null) { - firstTransactions = client.getTransactions(null, 0L, null, Long.MAX_VALUE, 1); + firstTransactions = client.getTransactions(null, 0L, null, 2000l, 1); } setLastTxCommitTimeAndTxIdInTrackerState(firstTransactions, state); @@ -1147,7 +1147,7 @@ public class MetadataTracker extends CoreStatePublisher implements Tracker { // DB TX Count long firstTransactionCommitTime = 0; - Transactions firstTransactions = client.getTransactions(null, 0L, null, Long.MAX_VALUE, 1); + Transactions firstTransactions = client.getTransactions(null, 0L, null, 2000l, 1); if(firstTransactions.getTransactions().size() > 0) { Transaction firstTransaction = firstTransactions.getTransactions().get(0); diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java index d8c65469b..db82478b7 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java @@ -127,7 +127,10 @@ public class AlfrescoSolrUtils long txnCommitTime = System.currentTimeMillis(); Transaction transaction = new Transaction(); transaction.setCommitTimeMs(txnCommitTime); - transaction.setId(generateId()); + // A safer number for a transaction Id should be in [1-2000] range, + // so this is the range accepted for the starting transaction number + // on a SOLR Core + transaction.setId(RANDOMIZER.nextInt(2000) + 1); transaction.setDeletes(deletes); transaction.setUpdates(updates); return transaction;