From bed650f5748fa2933245906b7bee641e81fbb2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Cea=20Fontenla?= Date: Fri, 1 Aug 2025 16:34:43 +0200 Subject: [PATCH] ESQL: Fix Driver creating status with a live list of operators (#132260) `DriverStatus` is an immutable record created by the Driver. However, its components are not inherently immutable. This PR fixes a live collection used by the Driver, that was being directly put into the status, leading to `ConcurrentModificationException`s when reading it (Through the Task list API, for example). Some example errors: ``` java.util.ConcurrentModificationException at java.base/java.util.ArrayList$Itr.checkForComodification(ArrayList.java:1096) at java.base/java.util.ArrayList$Itr.next(ArrayList.java:1050) at org.elasticsearch.compute.operator.DriverStatus.toXContent(DriverStatus.java:134) at org.elasticsearch.xcontent@9.2.0/org.elasticsearch.xcontent.XContentBuilder.value(XContentBuilder.java:993) at org.elasticsearch.xcontent@9.2.0/org.elasticsearch.xcontent.XContentBuilder.field(XContentBuilder.java:978) at org.elasticsearch.server@9.2.0/org.elasticsearch.tasks.TaskInfo.toXContent(TaskInfo.java:113) at org.elasticsearch.server@9.2.0/org.elasticsearch.action.admin.cluster.node.tasks.list.TaskGroup.toXContent(TaskGroup.java:63) at org.elasticsearch.server@9.2.0/org.elasticsearch.action.admin.cluster.node.tasks.list.TaskGroup.toXContent(TaskGroup.java:67) at org.elasticsearch.server@9.2.0/org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse.lambda$groupedByParent$10(ListTasksResponse.java:183) ``` And: ``` java.util.ConcurrentModificationException at java.base/java.util.ArrayList$Itr.checkForComodification(ArrayList.java:1096) at java.base/java.util.ArrayList$Itr.next(ArrayList.java:1050) at org.elasticsearch.compute.operator.DriverStatus.documentsFound(DriverStatus.java:157) at org.elasticsearch.compute.operator.DriverStatus.toXContent(DriverStatus.java:129) at org.elasticsearch.xcontent@9.2.0/org.elasticsearch.xcontent.XContentBuilder.value(XContentBuilder.java:993) at org.elasticsearch.xcontent@9.2.0/org.elasticsearch.xcontent.XContentBuilder.field(XContentBuilder.java:978) at org.elasticsearch.server@9.2.0/org.elasticsearch.tasks.TaskInfo.toXContent(TaskInfo.java:113) at org.elasticsearch.server@9.2.0org.elasticsearch.action.admin.cluster.node.tasks.list.TaskGroup.toXContent(TaskGroup.java:63) at org.elasticsearch.server@9.2.0/org.elasticsearch.action.admin.cluster.node.tasks.list.TaskGroup.toXContent(TaskGroup.java:67) at org.elasticsearch.server@9.2.0/org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse.lambda$groupedByParent$10(ListTasksResponse.java:183) ``` Also, this looks like the source of this issue, with another similar case: Fixes https://github.com/elastic/elasticsearch/issues/131564 --- docs/changelog/132260.yaml | 6 +++ .../compute/operator/Driver.java | 2 +- .../compute/operator/DriverTests.java | 43 +++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/132260.yaml diff --git a/docs/changelog/132260.yaml b/docs/changelog/132260.yaml new file mode 100644 index 0000000000000..f00d3fc07fcc9 --- /dev/null +++ b/docs/changelog/132260.yaml @@ -0,0 +1,6 @@ +pr: 132260 +summary: FIx Driver creating status with a live list of operators +area: ES|QL +type: bug +issues: + - 131564 diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java index 0ad3c64fcaf09..b91cd3f468ad5 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java @@ -556,7 +556,7 @@ private void updateStatus(long extraCpuNanos, int extraIterations, DriverStatus. prev.cpuNanos() + extraCpuNanos, prev.iterations() + extraIterations, status, - statusOfCompletedOperators, + List.copyOf(statusOfCompletedOperators), activeOperators.stream().map(op -> new OperatorStatus(op.toString(), op.status())).toList(), sleeps ); diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/DriverTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/DriverTests.java index c538cf41ee1fd..be3f11744d3a0 100644 --- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/DriverTests.java +++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/DriverTests.java @@ -49,6 +49,8 @@ import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.sameInstance; public class DriverTests extends ESTestCase { /** @@ -204,6 +206,47 @@ public void testProfileAndStatusInterval() { assertThat(driver.profile().iterations(), equalTo((long) inPages.size())); } + public void testUnchangedStatus() { + DriverContext driverContext = driverContext(); + List inPages = randomList(2, 100, DriverTests::randomPage); + List outPages = new ArrayList<>(); + + long startEpoch = randomNonNegativeLong(); + long startNanos = randomLong(); + long waitTime = randomLongBetween(10000, 100000); + long tickTime = randomLongBetween(10000, 100000); + long statusInterval = randomLongBetween(1, 10); + + Driver driver = createDriver(startEpoch, startNanos, driverContext, inPages, outPages, TimeValue.timeValueNanos(statusInterval)); + + NowSupplier nowSupplier = new NowSupplier(startNanos, waitTime, tickTime); + + int iterationsPerTick = randomIntBetween(1, 10); + + for (int i = 0; i < inPages.size(); i += iterationsPerTick) { + DriverStatus initialStatus = driver.status(); + long completedOperatorsHash = initialStatus.completedOperators().hashCode(); + long activeOperatorsHash = initialStatus.activeOperators().hashCode(); + long sleepsHash = initialStatus.sleeps().hashCode(); + + driver.run(TimeValue.timeValueDays(10), iterationsPerTick, nowSupplier); + + DriverStatus newStatus = driver.status(); + assertThat(newStatus, not(sameInstance(initialStatus))); + assertThat( + newStatus.completedOperators() != initialStatus.completedOperators() + || newStatus.completedOperators().hashCode() == completedOperatorsHash, + equalTo(true) + ); + assertThat( + newStatus.activeOperators() != initialStatus.activeOperators() + || newStatus.activeOperators().hashCode() == activeOperatorsHash, + equalTo(true) + ); + assertThat(newStatus.sleeps() != initialStatus.sleeps() || newStatus.sleeps().hashCode() == sleepsHash, equalTo(true)); + } + } + private static Driver createDriver( long startEpoch, long startNanos,