Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix][test] Fix multiple thread leaks in tests, part 2 #21513

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@ private static boolean shouldSkipThread(Thread thread) {
if (threadName.startsWith("testcontainers-wait-")) {
return true;
}
// org.rnorth.ducttape.timeouts.Timeouts.EXECUTOR_SERVICE thread pool, used by Testcontainers
if (threadName.startsWith("ducttape-")) {
return true;
}
}
Runnable target = extractRunnableTarget(thread);
if (target != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ public void setup() throws Exception {
@AfterClass(alwaysRun = true)
@Override
public void cleanup() throws Exception {
pulsar.getConfiguration().setBrokerShutdownTimeoutMs(0);
adminTls.close();
otheradmin.close();
super.internalCleanup();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import java.util.Properties;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.admin.cli.extensions.CustomCommandFactory;
import org.apache.pulsar.admin.cli.utils.SchemaExtractor;
Expand Down Expand Up @@ -2254,7 +2255,9 @@ public void requestTimeout() throws Exception {
//Ok
}

ClientConfigurationData conf = ((PulsarAdminImpl)tool.getPulsarAdminSupplier().get()).getClientConfigData();
@Cleanup
PulsarAdminImpl pulsarAdmin = (PulsarAdminImpl) tool.getPulsarAdminSupplier().get();
ClientConfigurationData conf = pulsarAdmin.getClientConfigData();

assertEquals(1000, conf.getRequestTimeoutMs());
}
Expand All @@ -2264,7 +2267,6 @@ public void testSourceCreateMissingSourceConfigFileFaileWithExitCode1() throws E
Properties properties = new Properties();
properties.put("webServiceUrl", "http://localhost:2181");
PulsarAdminTool tool = new PulsarAdminTool(properties);

assertFalse(tool.run("sources create --source-config-file doesnotexist.yaml".split(" ")));
}

Expand Down Expand Up @@ -2298,8 +2300,9 @@ public void testAuthTlsWithJsonParam() throws Exception {
}

// validate Authentication-tls has been configured
ClientConfigurationData conf = ((PulsarAdminImpl)tool.getPulsarAdminSupplier().get())
.getClientConfigData();
@Cleanup
PulsarAdminImpl pulsarAdmin = (PulsarAdminImpl) tool.getPulsarAdminSupplier().get();
ClientConfigurationData conf = pulsarAdmin.getClientConfigData();
AuthenticationTls atuh = (AuthenticationTls) conf.getAuthentication();
assertEquals(atuh.getCertFilePath(), certFilePath);
assertEquals(atuh.getKeyFilePath(), keyFilePath);
Expand All @@ -2312,8 +2315,9 @@ public void testAuthTlsWithJsonParam() throws Exception {
// Ok
}

conf = conf = ((PulsarAdminImpl)tool.getPulsarAdminSupplier().get())
.getClientConfigData();
@Cleanup
PulsarAdminImpl pulsarAdmin2 = (PulsarAdminImpl) tool.getPulsarAdminSupplier().get();
conf = pulsarAdmin2.getClientConfigData();
atuh = (AuthenticationTls) conf.getAuthentication();
assertEquals(atuh.getCertFilePath(), certFilePath);
assertEquals(atuh.getKeyFilePath(), keyFilePath);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ public void readModifyUpdateBadVersionRetry() throws Exception {
String url = zks.getConnectionString();
@Cleanup
MetadataStore sourceStore1 = MetadataStoreFactory.create(url, MetadataStoreConfig.builder().build());
@Cleanup
MetadataStore sourceStore2 = MetadataStoreFactory.create(url, MetadataStoreConfig.builder().build());

MetadataCache<MyClass> objCache1 = sourceStore1.getMetadataCache(MyClass.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ public void testPersistent(String provider, Supplier<String> urlSupplier) throws

@Test(dataProvider = "impl")
public void testConcurrentPutGetOneKey(String provider, Supplier<String> urlSupplier) throws Exception {
@Cleanup
MetadataStore store = MetadataStoreFactory.create(urlSupplier.get(),
MetadataStoreConfig.builder().fsyncEnable(false).build());
byte[] data = new byte[]{0};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public void testSimple(String provider, Supplier<String> urlSupplier) throws Exc

methodSetup(urlSupplier);

@Cleanup
LedgerAuditorManager lam1 = new PulsarLedgerAuditorManager(store1, ledgersRootPath);
assertNull(lam1.getCurrentAuditor());

Expand All @@ -89,6 +90,7 @@ public void testSimple(String provider, Supplier<String> urlSupplier) throws Exc
@Cleanup("shutdownNow")
ExecutorService executor = Executors.newCachedThreadPool();

@Cleanup
LedgerAuditorManager lam2 = new PulsarLedgerAuditorManager(store2, ledgersRootPath);
assertEquals(lam2.getCurrentAuditor(), BookieId.parse("bookie-1:3181"));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public void testMultipleInstances() throws Exception {
store1.close();
store2.put("/test-2", new byte[0], Optional.empty()).join();
Assert.assertTrue(store2.exists("/test-2").join());
store2.close();

FileUtils.deleteQuietly(tempDir.toFile());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.netty.resolver.dns.DnsAddressResolverGroup;
import io.netty.resolver.dns.DnsNameResolverBuilder;
import io.netty.util.concurrent.DefaultThreadFactory;
import io.netty.util.concurrent.Future;
import io.prometheus.client.Counter;
import io.prometheus.client.Gauge;
import java.io.Closeable;
Expand Down Expand Up @@ -151,6 +152,8 @@ public class ProxyService implements Closeable {
@Getter
private final ConnectionController connectionController;

private boolean gracefulShutdown = true;

public ProxyService(ProxyConfiguration proxyConfig,
AuthenticationService authenticationService) throws Exception {
requireNonNull(proxyConfig);
Expand Down Expand Up @@ -373,7 +376,7 @@ public void close() throws IOException {

// Don't accept any new connections
try {
acceptorGroup.shutdownGracefully().sync();
shutdownEventLoop(acceptorGroup).sync();
} catch (InterruptedException e) {
LOG.info("Shutdown of acceptorGroup interrupted");
Thread.currentThread().interrupt();
Expand Down Expand Up @@ -413,14 +416,14 @@ public void close() throws IOException {
}
}
try {
workerGroup.shutdownGracefully().sync();
shutdownEventLoop(workerGroup).sync();
} catch (InterruptedException e) {
LOG.info("Shutdown of workerGroup interrupted");
Thread.currentThread().interrupt();
}
for (EventLoopGroup group : extensionsWorkerGroups) {
try {
group.shutdownGracefully().sync();
shutdownEventLoop(group).sync();
} catch (InterruptedException e) {
LOG.info("Shutdown of {} interrupted", group);
Thread.currentThread().interrupt();
Expand Down Expand Up @@ -532,4 +535,24 @@ public synchronized void addPrometheusRawMetricsProvider(PrometheusRawMetricsPro
protected LookupProxyHandler newLookupProxyHandler(ProxyConnection proxyConnection) {
return new LookupProxyHandler(this, proxyConnection);
}

// Shutdown the event loop.
// If graceful is true, will wait for the current requests to be completed, up to 15 seconds.
// Graceful shutdown can be disabled by setting the gracefulShutdown flag to false. This is used in tests
// to speed up the shutdown process.
private Future<?> shutdownEventLoop(EventLoopGroup eventLoop) {
if (gracefulShutdown) {
return eventLoop.shutdownGracefully();
} else {
return eventLoop.shutdownGracefully(0, 0, TimeUnit.SECONDS);
}
}

public boolean isGracefulShutdown() {
return gracefulShutdown;
}

public void setGracefulShutdown(boolean gracefulShutdown) {
this.gracefulShutdown = gracefulShutdown;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ protected void setup() throws Exception {
AuthenticationService authService =
new AuthenticationService(PulsarConfigurationLoader.convertFrom(proxyConfig));
proxyService = Mockito.spy(new ProxyService(proxyConfig, authService));
proxyService.setGracefulShutdown(false);
webServer = new WebServer(proxyConfig, authService);
}

Expand Down Expand Up @@ -455,9 +456,11 @@ public void tlsCiphersAndProtocols(Set<String> tlsCiphers, Set<String> tlsProtoc
proxyConfig.setTlsProtocols(tlsProtocols);
proxyConfig.setTlsCiphers(tlsCiphers);

@Cleanup
ProxyService proxyService = Mockito.spy(new ProxyService(proxyConfig,
new AuthenticationService(
PulsarConfigurationLoader.convertFrom(proxyConfig))));
proxyService.setGracefulShutdown(false);
try {
proxyService.start();
} catch (Exception ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,7 @@ private void releaseTxnLogBufferedWriterContext(TxnLogBufferedWriterContext cont
context.txnLogBufferedWriter.close().get();
context.metrics.close();
context.timer.stop();
context.orderedExecutor.shutdownNow();
CollectorRegistry.defaultRegistry.clear();
}

Expand All @@ -936,6 +937,7 @@ private static class TxnLogBufferedWriterContext{
MockedManagedLedger mockedManagedLedger;
Timer timer;
TxnLogBufferedWriterMetricsStats metrics;
OrderedExecutor orderedExecutor;
}

@AllArgsConstructor
Expand Down Expand Up @@ -970,7 +972,7 @@ private TxnLogBufferedWriterContext createTxnBufferedWriterContextWithMetrics(
dataSerializer, batchedWriteMaxRecords, batchedWriteMaxSize,
batchedWriteMaxDelayInMillis, true, metricsStats);
return new TxnLogBufferedWriterContext(txnLogBufferedWriter, mockedManagedLedger, transactionTimer,
metricsStats);
metricsStats, orderedExecutor);
}

private void verifyTheCounterMetrics(int triggeredByRecordCount, int triggeredByMaxSize, int triggeredByMaxDelay,
Expand Down