From b15513ca3c7d94a186743be093935de82eef3e41 Mon Sep 17 00:00:00 2001 From: Keerat Date: Mon, 14 Sep 2020 10:23:11 +0100 Subject: [PATCH 1/4] SEARCH-2398 fix for alfrescosolrreload test --- .../src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java index da66947e5..56c4d22a9 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java @@ -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, 150000); + waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 200000); } private void reloadAndAssertCorrect(Collection trackers, int numOfTrackers, int jobs) throws Exception From 7759f0f382d9bc1ea01e5177bdf8416da9ae1ad6 Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 15 Sep 2020 08:41:05 +0100 Subject: [PATCH 2/4] SEARCH-2398 adding the wait time to double the amount when numNodes*2 --- .../solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java index 82400a536..b4787730d 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java @@ -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, 150000); + waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 200000); } private void reloadAndAssertCorrect(Collection trackers, int numOfTrackers, int jobs) throws Exception From ccad6d80f43b12935cc5685a77e8838ccb02a467 Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 15 Sep 2020 10:59:06 +0100 Subject: [PATCH 3/4] SEARCH-2398 increasing the wait time when numNodes*2 --- .../solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java | 2 +- .../src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java index b4787730d..085a938a4 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java @@ -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, 200000); + waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 300000); } private void reloadAndAssertCorrect(Collection trackers, int numOfTrackers, int jobs) throws Exception diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java index 56c4d22a9..cdff9f50f 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java @@ -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, 200000); + waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 300000); } private void reloadAndAssertCorrect(Collection trackers, int numOfTrackers, int jobs) throws Exception From a7d1f8b015ee70f1865c88b3e7da08db917eada5 Mon Sep 17 00:00:00 2001 From: Keerat Date: Tue, 15 Sep 2020 13:25:24 +0100 Subject: [PATCH 4/4] SEARCH-2398 increasing the wait time when numNodes*2 to 500000 --- .../solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java | 2 +- .../src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java index 085a938a4..6a7f8c9b6 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoIndexingStatePersistenceAcrossReloadsIT.java @@ -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, 300000); + waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 500000); } private void reloadAndAssertCorrect(Collection trackers, int numOfTrackers, int jobs) throws Exception diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java index cdff9f50f..c2db7d731 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java @@ -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, 300000); + waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), numNodes * 2, 500000); } private void reloadAndAssertCorrect(Collection trackers, int numOfTrackers, int jobs) throws Exception