Skip to content

Fix client leak on BulkProcessor or Sniffer construction failure #1865

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.

Sign up for GitHub

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

Merged
jnioche merged 1 commit into from
Apr 2, 2026
+37 −19
Merged

Fix client leak on BulkProcessor or Sniffer construction failure #1865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 37 additions & 19 deletions ...nal/opensearch/src/main/java/org/apache/stormcrawler/opensearch/OpenSearchConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,27 +286,45 @@ public static OpenSearchConnection getConnection(
new HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory(
bufferSize * 1024 * 1024));

final BulkProcessor bulkProcessor =
BulkProcessor.builder(
(request, bulkListener) ->
client.bulkAsync(
request,
requestOptionsBuilder.build(),
bulkListener),
listener)
.setFlushInterval(flushInterval)
.setBulkActions(bulkActions)
.setConcurrentRequests(concurrentRequests)
.build();

boolean sniff =
ConfUtils.getBoolean(stormConf, Constants.PARAMPREFIX, dottedType, "sniff", true);
BulkProcessor bulkProcessor = null;
Sniffer sniffer = null;
if (sniff) {
sniffer = Sniffer.builder(client.getLowLevelClient()).build();
}
try {
bulkProcessor =
BulkProcessor.builder(
(request, bulkListener) ->
client.bulkAsync(
request,
requestOptionsBuilder.build(),
bulkListener),
listener)
.setFlushInterval(flushInterval)
.setBulkActions(bulkActions)
.setConcurrentRequests(concurrentRequests)
.build();

boolean sniff =
ConfUtils.getBoolean(
stormConf, Constants.PARAMPREFIX, dottedType, "sniff", true);
if (sniff) {
sniffer = Sniffer.builder(client.getLowLevelClient()).build();
}

return new OpenSearchConnection(client, bulkProcessor, sniffer);
return new OpenSearchConnection(client, bulkProcessor, sniffer);
} catch (Exception e) {
if (bulkProcessor != null) {
try {
bulkProcessor.close();
} catch (Exception suppressed) {
e.addSuppressed(suppressed);
}
}
try {
client.close();
} catch (IOException suppressed) {
e.addSuppressed(suppressed);
}
throw e;
}
}

private boolean isClosed = false;
Expand Down