Skip to content

Fix timer and client leak in OpenSearch JSONResourceWrapper #1866

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 2 commits into from
Apr 2, 2026
+45 −35
Merged

Fix timer and client leak in OpenSearch JSONResourceWrapper #1866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16c62bf
Fix timer and client leak in OpenSearch JSONResourceWrapper
jnioche Apr 2, 2026
44db6a1
Reformat
jnioche Apr 2, 2026
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
80 changes: 45 additions & 35 deletions ...ch/src/main/java/org/apache/stormcrawler/opensearch/parse/filter/JSONResourceWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.databind.JsonNode;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
Expand Down Expand Up @@ -70,6 +71,8 @@ public class JSONResourceWrapper extends ParseFilter {
private static final Logger LOG = LoggerFactory.getLogger(JSONResourceWrapper.class);

private ParseFilter delegatedParseFilter;
private Timer refreshTimer;
private RestHighLevelClient osClient;

public void configure(@NotNull Map<String, Object> stormConf, @NotNull JsonNode filterParams) {

Expand Down Expand Up @@ -126,46 +129,53 @@ public void configure(@NotNull Map<String, Object> stormConf, @NotNull JsonNode

final JSONResource resource = (JSONResource) delegatedParseFilter;

new Timer()
.schedule(
new TimerTask() {
private RestHighLevelClient esClient;

public void run() {
if (esClient == null) {
try {
esClient =
OpenSearchConnection.getClient(stormConf, "config");
} catch (Exception e) {
LOG.error(
"Exception while creating OpenSearch connection",
e);
}
}
if (esClient != null) {
LOG.info("Reloading json resources from OpenSearch");
try {
GetResponse response =
esClient.get(
new GetRequest(
"config",
resource.getResourceFile()),
RequestOptions.DEFAULT);
resource.loadJSONResources(
new ByteArrayInputStream(
response.getSourceAsBytes()));
} catch (Exception e) {
LOG.error("Can't load config from OpenSearch", e);
}
}
refreshTimer = new Timer();
refreshTimer.schedule(
new TimerTask() {
public void run() {
if (osClient == null) {
try {
osClient = OpenSearchConnection.getClient(stormConf, "config");
} catch (Exception e) {
LOG.error("Exception while creating OpenSearch connection", e);
}
},
0,
refreshRate * 1000);
}
if (osClient != null) {
LOG.info("Reloading json resources from OpenSearch");
try {
GetResponse response =
osClient.get(
new GetRequest(
"config", resource.getResourceFile()),
RequestOptions.DEFAULT);
resource.loadJSONResources(
new ByteArrayInputStream(response.getSourceAsBytes()));
} catch (Exception e) {
LOG.error("Can't load config from OpenSearch", e);
}
}
}
},
0,
refreshRate * 1000);
}

@Override
public void filter(String URL, byte[] content, DocumentFragment doc, ParseResult parse) {
delegatedParseFilter.filter(URL, content, doc, parse);
}

@Override
public void cleanup() {
if (refreshTimer != null) {
refreshTimer.cancel();
}
if (osClient != null) {
try {
osClient.close();
} catch (IOException e) {
LOG.error("Exception when closing OpenSearch client", e);
}
}
}
}