Skip to content

Remove upfront OCC resolution for bulk-by-scroll and handle seq_no per index#144309

Merged
fcofdez merged 5 commits intoelastic:mainfrom
fcofdez:revert-limitations-update-by-query-new
Mar 17, 2026
Merged

Remove upfront OCC resolution for bulk-by-scroll and handle seq_no per index#144309
fcofdez merged 5 commits intoelastic:mainfrom
fcofdez:revert-limitations-update-by-query-new

Conversation

@fcofdez
Copy link
Copy Markdown
Contributor

@fcofdez fcofdez commented Mar 16, 2026

Replace the BulkByScrollOCCResolver, which rejected mixed
disable_sequence_numbers settings across indices, with
per-index handling. The search phase now always requests
seqNoAndPrimaryTerm (indices with sequence numbers
disabled return sentinel values), and OCC is unconditionally enabled.
TransportBulkAction checks only the target index setting when
allowing writes with explicit ids to backing indices.

Relates #136305

…r index

Replace the BulkByScrollOCCResolver, which rejected mixed disable_sequence_numbers
settings across indices, with per-index handling. The search phase now always requests
seqNoAndPrimaryTerm (indices with sequence numbers disabled return sentinel values),
and OCC is unconditionally enabled. TransportBulkAction checks only the target index
setting when allowing writes with explicit IDs to backing indices.
@fcofdez fcofdez requested review from romseygeek and tlrx March 16, 2026 11:14
@fcofdez fcofdez added >non-issue :Distributed/Reindex Issues relating to reindex that are not caused by issues further down Team:Distributed Meta label for distributed team. v9.4.0 labels Mar 16, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-distributed (Team:Distributed)

Copy link
Copy Markdown
Contributor

@romseygeek romseygeek left a comment

Choose a reason for hiding this comment

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

Nice!

Copy link
Copy Markdown
Member

@tlrx tlrx left a comment

Choose a reason for hiding this comment

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

LGTM

@fcofdez
Copy link
Copy Markdown
Contributor Author

fcofdez commented Mar 16, 2026

@elasticmachine update branch

@fcofdez
Copy link
Copy Markdown
Contributor Author

fcofdez commented Mar 16, 2026

@elasticmachine update branch

@fcofdez
Copy link
Copy Markdown
Contributor Author

fcofdez commented Mar 16, 2026

@elasticmachine update branch

@fcofdez
Copy link
Copy Markdown
Contributor Author

fcofdez commented Mar 17, 2026

Compilation is broken by something else, updating the branch again...

@fcofdez
Copy link
Copy Markdown
Contributor Author

fcofdez commented Mar 17, 2026

@elasticmachine update branch

@fcofdez fcofdez merged commit 17113ab into elastic:main Mar 17, 2026
36 checks passed
@fcofdez
Copy link
Copy Markdown
Contributor Author

fcofdez commented Mar 17, 2026

Thanks Alan and Tanguy!

michalborek pushed a commit to michalborek/elasticsearch that referenced this pull request Mar 23, 2026
…r index (elastic#144309)

Replace the BulkByScrollOCCResolver, which rejected mixed
disable_sequence_numbers settings across indices, with
per-index handling. The search phase now always requests
seqNoAndPrimaryTerm (indices with sequence numbers
disabled return sentinel values), and OCC is unconditionally enabled.
TransportBulkAction checks only the target index setting when
allowing writes with explicit ids to backing indices.

Relates elastic#136305
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Distributed/Reindex Issues relating to reindex that are not caused by issues further down >non-issue Team:Distributed Meta label for distributed team. v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants