[ES|QL] Fix ES|QL columns reset race during active fetch#263947
Merged
bartoval merged 3 commits intoelastic:mainfrom Apr 22, 2026
Merged
[ES|QL] Fix ES|QL columns reset race during active fetch#263947bartoval merged 3 commits intoelastic:mainfrom
bartoval merged 3 commits intoelastic:mainfrom
Conversation
bartoval
commented
Apr 17, 2026
| }), | ||
| }, | ||
|
|
||
| setProfileStateFieldsToResetWithoutResetId: ( |
Contributor
Author
There was a problem hiding this comment.
Better a new action that represents a semantic exception than a flag on the previous action.
Contributor
|
Pinging @elastic/kibana-data-discovery (Team:DataDiscovery) |
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsTest Failures
Metrics [docs]Async chunks
cc @bartoval |
davismcphee
approved these changes
Apr 22, 2026
Contributor
davismcphee
left a comment
There was a problem hiding this comment.
It's a strange one, thanks for the fix!
Comment on lines
+159
to
+161
| // This reset comes from the current fetch, so keep the same resetId. | ||
| // Otherwise the snapshot taken at fetch start looks stale when cleanup runs. | ||
| injectCurrentTab(internalStateActions.setProfileStateFieldsToResetWithoutResetId)({ |
Contributor
There was a problem hiding this comment.
I went down the rabbit hole on this and funny enough, it seems like this is likely dead code anyway (other than the bug 🙃). Not certain yet so these changes are good for now until we investigate, but opened a separate issue for it here: #264870.
mbondyra
added a commit
to mbondyra/kibana
that referenced
this pull request
Apr 22, 2026
…sationChanges23 * commit '9a7b717c662d1c904052bc59f0e5a81daab87c7f': (145 commits) Upgrade EUI to v114.2.0 (elastic#264550) [Entity Analytics] Add missing OpenAPI descriptions and examples to p… (elastic#264778) [Entity Resolution] Clarify CSV upload result for already-linked entities (elastic#264689) [AI Infra] Fix failing GenAI Settings Scout tests (elastic#260496) [Agent Builder] [Bug Bash] OAuth connector settings mention fields that are not there (elastic#264756) [performance] process-wide cache for advanced settings lookup (elastic#262618) [CI] Update limits.yml for securitySolution (elastic#264946) [SLO] Fix APM embeddable ids (elastic#264750) [EDR Workflows] Unify artifacts empty state buttons (elastic#264389) [Alert Triage workflow] Adds security.buildAlertEntityGraph and security.renderAlertNarrative… (elastic#259159) [SigEvents] Add KI feature identification endpoints and refactor task to use shared service (elastic#263528) [Scout] Migrate Data Views API tests from FTR - Part5 (elastic#264088) [Cases] Apply shared extended_fields path util server side (elastic#264706) [Lens as code] Fix metric trendline (elastic#264777) [api-docs] 2026-04-22 Daily api_docs build (elastic#264882) [Scout] Update test config manifests (elastic#264575) [workflows_management] Lazy-load Zod connector schemas to cut idle memory (elastic#264283) [ES|QL] Fix ES|QL columns reset race during active fetch (elastic#263947) [Content List] Column layout props, sticky actions, and title click handlers (elastic#264203) [Lens as code] Validate `id` in route for new vis types (elastic#264480) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Closes #255817
When a transformational ES|QL fetch changes the available columns, Discover requests a temporary
columnsreset. Before this change, that reset also changedresetIdeven though it was triggered by the active fetch itself.That could prevent cleanup from running when the first fetch finished, leaving the
columnsreset armed longer than intended.This was most visible in Serverless Observability because its data source profiles provide default columns that can override ES|QL KEEP columns when the stale reset is consumed.
fix.mp4