You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/09/06 14:46:10 UTC
[solr] branch main updated: SOLR-16046: Thread leak in TestLeaderElectionZkExpiry (#841)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new e03cb5356e7 SOLR-16046: Thread leak in TestLeaderElectionZkExpiry (#841)
e03cb5356e7 is described below
commit e03cb5356e71eed3bcf75e4ee623d8dfeb2f6656
Author: Kevin Risden <ri...@users.noreply.github.com>
AuthorDate: Tue Sep 6 10:46:05 2022 -0400
SOLR-16046: Thread leak in TestLeaderElectionZkExpiry (#841)
---
.../solr/cloud/TestLeaderElectionZkExpiry.java | 78 ++++++++++++----------
1 file changed, 41 insertions(+), 37 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
index d609f9a9593..5b2471437ad 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
@@ -16,25 +16,27 @@
*/
package org.apache.solr.cloud;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.Collections;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.lucene.tests.util.LuceneTestCase.BadApple;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.util.ExecutorUtil;
+import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.CloudConfig;
import org.apache.solr.core.CoreContainer;
+import org.apache.solr.util.TimeOut;
import org.apache.zookeeper.KeeperException;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@ThreadLeakLingering(linger = 30)
@BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-16122")
public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
-
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SOLRXML = "<solr></solr>";
@@ -43,10 +45,9 @@ public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
public void testLeaderElectionWithZkExpiry() throws Exception {
Path zkDir = createTempDir("zkData");
Path ccDir = createTempDir("testLeaderElectionWithZkExpiry-solr");
- CoreContainer cc = createCoreContainer(ccDir, SOLRXML);
+
final ZkTestServer server = new ZkTestServer(zkDir);
server.setTheTickTime(1000);
- SolrZkClient zc = null;
try {
server.run();
@@ -55,52 +56,55 @@ public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
.setLeaderConflictResolveWait(180000)
.setLeaderVoteWait(180000)
.build();
- final ZkController zkController =
- new ZkController(
- cc, server.getZkAddress(), 15000, cloudConfig, () -> Collections.emptyList());
+
+ CoreContainer cc = createCoreContainer(ccDir, SOLRXML);
try {
- Thread killer =
- new Thread() {
- @Override
- public void run() {
- long timeout =
- System.nanoTime() + TimeUnit.NANOSECONDS.convert(10, TimeUnit.SECONDS);
- while (System.nanoTime() < timeout) {
+ ExecutorService threadExecutor =
+ ExecutorUtil.newMDCAwareSingleThreadExecutor(
+ new SolrNamedThreadFactory(this.getTestName()));
+ try (ZkController zkController =
+ new ZkController(
+ cc, server.getZkAddress(), 15000, cloudConfig, Collections::emptyList)) {
+ threadExecutor.submit(
+ () -> {
+ TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
+ while (!timeout.hasTimedOut()) {
server.expire(zkController.getZkClient().getZooKeeper().getSessionId());
try {
- Thread.sleep(10);
+ timeout.sleep(10);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
return;
}
}
+ });
+ try (SolrZkClient zc =
+ new SolrZkClient(server.getZkAddress(), LeaderElectionTest.TIMEOUT)) {
+ boolean found = false;
+ TimeOut timeout = new TimeOut(60, TimeUnit.SECONDS, TimeSource.NANO_TIME);
+ while (!timeout.hasTimedOut()) {
+ try {
+ String leaderNode = OverseerCollectionConfigSetProcessor.getLeaderNode(zc);
+ if (leaderNode != null && !leaderNode.trim().isEmpty()) {
+ if (log.isInfoEnabled()) {
+ log.info("Time={} Overseer leader is = {}", System.nanoTime(), leaderNode);
+ }
+ found = true;
+ break;
+ }
+ } catch (KeeperException.NoNodeException nne) {
+ // ignore
}
- };
- killer.start();
- killer.join();
- long timeout = System.nanoTime() + TimeUnit.NANOSECONDS.convert(60, TimeUnit.SECONDS);
- zc = new SolrZkClient(server.getZkAddress(), LeaderElectionTest.TIMEOUT);
- boolean found = false;
- while (System.nanoTime() < timeout) {
- try {
- String leaderNode = OverseerCollectionConfigSetProcessor.getLeaderNode(zc);
- if (leaderNode != null && !leaderNode.trim().isEmpty()) {
- if (log.isInfoEnabled()) {
- log.info("Time={} Overseer leader is = {}", System.nanoTime(), leaderNode);
- }
- found = true;
- break;
}
- } catch (KeeperException.NoNodeException nne) {
- // ignore
+ assertTrue(found);
}
+ } finally {
+ ExecutorUtil.shutdownNowAndAwaitTermination(threadExecutor);
}
- assertTrue(found);
} finally {
- zkController.close();
+ cc.shutdown();
}
} finally {
- cc.shutdown();
- if (zc != null) zc.close();
server.shutdown();
}
}