Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-11 04:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add logging and impoved cleanup to TestStressCloudBlindAtomicUpdates setup/teardown codepaths that occasionally cause suite level failures in jenkins

Browse Source 
The use of closeQuietly should hopefully prevent failures closing one HttpClient from resulting in other client objects being leaked

The setup changes are unlikey to improve test reliability, but will hopefully help diagnose where/how NPEs are coming from that currently cause some suite failures.

(cherry picked from commit 8bee03f49033007102a32449bac0c2ba257443c1)
This commit is contained in:
Chris Hostetter 2019-01-28 16:22:28 -07:00
parent 8413b105c2
commit d7cab5f7a3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
package org.apache.solr.cloud;
import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@ -136,7 +137,10 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
waitForRecoveriesToFinish(CLOUD_CLIENT);
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
CLIENTS.add(getHttpSolrClient(jetty.getBaseUrl() + "/" + COLLECTION_NAME + "/"));
assertNotNull("Cluster contains null jetty?", jetty);
final URL baseUrl = jetty.getBaseUrl();
assertNotNull("Jetty has null baseUrl: " + jetty.toString(), baseUrl);
CLIENTS.add(getHttpSolrClient(baseUrl + "/" + COLLECTION_NAME + "/"));
}
final boolean usingPoints = Boolean.getBoolean(NUMERIC_POINTS_SYSPROP);
@ -158,7 +162,10 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
IOUtils.closeQuietly(CLOUD_CLIENT);
CLOUD_CLIENT = null;
for (HttpSolrClient client : CLIENTS) {
client.close();
if (null == client) {
log.error("CLIENTS contains a null SolrClient???");
}
IOUtils.closeQuietly(client);
}
CLIENTS = null;
}