Skip to content

ESQL: Work around concurrent serialization bug #137350

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
elasticsearchmachine merged 1 commit into from
Oct 29, 2025
Merged

ESQL: Work around concurrent serialization bug #137350

Show file tree
Hide file tree
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,6 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT
method: test {p0=esql/40_tsdb/error on rename timestamp}
issue: https://github.com/elastic/elasticsearch/issues/137259
- class: org.elasticsearch.xpack.esql.plan.physical.ShowExecSerializationTests
method: testConcurrentSerialization
issue: https://github.com/elastic/elasticsearch/issues/137338
- class: org.elasticsearch.readiness.ReadinessClusterIT
method: testReadinessDuringRestartsNormalOrder
issue: https://github.com/elastic/elasticsearch/issues/136955
Expand Down
4 changes: 2 additions & 2 deletions test/framework/src/main/java/org/elasticsearch/test/AbstractWireTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ public final void testConcurrentSerialization() throws InterruptedException, Exe
for (int r = 0; r < rounds; r++) {
assertSerialization(testInstance);
}
} catch (IOException e) {
throw new AssertionError("error serializing", e);
} catch (IOException | AssertionError e) {
throw new AssertionError("error serializing [" + testInstance + "]", e);
}
});
} finally {
Expand Down
7 changes: 7 additions & 0 deletions ...plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,13 @@ private static ExponentialHistogram randomExponentialHistogram() {
ExponentialHistogramCircuitBreaker.noop(),
rawValues
);
/*
* hashcode mutates the histogram by doing some lazy work.
Copy link
Member Author

@nik9000 nik9000 Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I mean it makes something lazily. I don't mean that we were lazy when we wrote it. It's a lot of code....

* That can change the value of the hashCode if you call it concurrently....
* This works around that by running it once up front. Jonas will have a
* look at this one soon.
*/
histo.hashCode();
return histo;
}

Expand Down