Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jira/SOLR-13484

This commit is contained in:
Noble Paul 2019-05-23 16:59:14 +10:00
parent da5e46fc5a 3ed31cfbc7
commit 975a4f8f55
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java
View File

@ -255,7 +255,7 @@ public class TestSegmentToThreadMapping extends LuceneTestCase {
List<LeafReaderContext> leafReaderContexts = new ArrayList<>();
int max = 500_000;
int min = 10_000;
int numSegments = random().nextInt(50);
int numSegments = 1 + random().nextInt(50);
for (int i = 0; i < numSegments; i++) {
leafReaderContexts.add(new LeafReaderContext(dummyIndexReader(random().nextInt((max - min) + 1) + min)));

5
solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
View File

@ -81,7 +81,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
/** A basic client for operations at the cloud level, default collection will be set */
private static CloudSolrClient CLOUD_CLIENT;
/** One client per node */
private static ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);
private static final ArrayList<HttpSolrClient> CLIENTS = new ArrayList<>(5);
/** Service to execute all parallel work
* @see #NUM_THREADS
@ -136,6 +136,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
waitForRecoveriesToFinish(CLOUD_CLIENT);
CLIENTS.clear();
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
assertNotNull("Cluster contains null jetty?", jetty);
final URL baseUrl = jetty.getBaseUrl();
@ -167,7 +168,7 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
}
IOUtils.closeQuietly(client);
}
CLIENTS = null;
CLIENTS.clear();
}
@Before