Skip to content

ESQL: Log more on circuit breaker leaks #130943

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
nik9000 merged 2 commits into from
Jul 9, 2025
Merged

ESQL: Log more on circuit breaker leaks #130943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef47439
ESQL: Log more on circuit breaker leaks
nik9000 Jul 9, 2025
adf96a5
Merge branch 'main' into more_on_leak
nik9000 Jul 9, 2025
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
5 changes: 4 additions & 1 deletion ...le-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
import org.elasticsearch.test.TestClustersThreadFilter;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.xpack.esql.CsvSpecReader.CsvTestCase;
import org.elasticsearch.xpack.esql.plugin.ComputeService;
import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase;
import org.junit.ClassRule;

@ThreadLeakFilters(filters = TestClustersThreadFilter.class)
public class EsqlSpecIT extends EsqlSpecTestCase {
@ClassRule
public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> spec.plugin("inference-service-test"));
public static ElasticsearchCluster cluster = Clusters.testCluster(
spec -> spec.plugin("inference-service-test").setting("logger." + ComputeService.class.getName(), "DEBUG") // So we log a profile
);

@Override
protected String getTestRestCluster() {
Expand Down
18 changes: 10 additions & 8 deletions ...n/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.elasticsearch.geometry.utils.WellKnownText;
import org.elasticsearch.logging.LogManager;
import org.elasticsearch.logging.Logger;
import org.elasticsearch.test.MapMatcher;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.test.rest.TestFeatureService;
import org.elasticsearch.xcontent.XContentType;
Expand Down Expand Up @@ -437,16 +438,17 @@ public static void assertRequestBreakerEmpty() throws Exception {
HttpEntity entity = adminClient().performRequest(new Request("GET", "/_nodes/stats")).getEntity();
Map<?, ?> stats = XContentHelper.convertToMap(XContentType.JSON.xContent(), entity.getContent(), false);
Map<?, ?> nodes = (Map<?, ?>) stats.get("nodes");
for (Object n : nodes.values()) {
Map<?, ?> node = (Map<?, ?>) n;
Map<?, ?> breakers = (Map<?, ?>) node.get("breakers");
Map<?, ?> request = (Map<?, ?>) breakers.get("request");
assertMap(
"circuit breakers not reset to 0",
request,
matchesMap().extraOk().entry("estimated_size_in_bytes", 0).entry("estimated_size", "0b")

MapMatcher breakersEmpty = matchesMap().extraOk().entry("estimated_size_in_bytes", 0).entry("estimated_size", "0b");

MapMatcher nodesMatcher = matchesMap();
for (Object name : nodes.keySet()) {
nodesMatcher = nodesMatcher.entry(
name,
matchesMap().extraOk().entry("breakers", matchesMap().extraOk().entry("request", breakersEmpty))
);
}
assertMap("circuit breakers not reset to 0", stats, matchesMap().extraOk().entry("nodes", nodesMatcher));
});
}

Expand Down
37 changes: 25 additions & 12 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,23 +605,36 @@ public SourceProvider createSourceProvider() {
throw new IllegalStateException("no drivers created");
}
LOGGER.debug("using {} drivers", drivers.size());
driverRunner.executeDrivers(
task,
drivers,
transportService.getThreadPool().executor(ESQL_WORKER_THREAD_POOL_NAME),
ActionListener.releaseAfter(listener.map(ignored -> {
if (context.configuration().profile()) {
return DriverCompletionInfo.includingProfiles(
ActionListener<Void> driverListener = listener.map(ignored -> {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(
"finished {}",
DriverCompletionInfo.includingProfiles(
drivers,
context.description(),
clusterService.getClusterName().value(),
transportService.getLocalNode().getName(),
localPlan.toString()
);
} else {
return DriverCompletionInfo.excludingProfiles(drivers);
}
}), () -> Releasables.close(drivers))
)
);
}
if (context.configuration().profile()) {
return DriverCompletionInfo.includingProfiles(
drivers,
context.description(),
clusterService.getClusterName().value(),
transportService.getLocalNode().getName(),
localPlan.toString()
);
} else {
return DriverCompletionInfo.excludingProfiles(drivers);
}
});
driverRunner.executeDrivers(
task,
drivers,
transportService.getThreadPool().executor(ESQL_WORKER_THREAD_POOL_NAME),
ActionListener.releaseAfter(driverListener, () -> Releasables.close(drivers))
);
} catch (Exception e) {
listener.onFailure(e);
Expand Down