[DVD-111818] Add op_type and conflicts kwargs to reindex_from_local / reindex_from_remote - #82
Merged
olly-chadwick-carwow merged 4 commits intoMay 5, 2026
Conversation
olly-chadwick-carwow
changed the title
…patiblity with the latest ubuntu runner
| @@ -23,18 +23,18 @@ def initialize(config) | |||
|
|
|||
Contributor
Author
There was a problem hiding this comment.
Changes in this file are just rubocop fixes.
| @@ -5,9 +5,9 @@ | |||
| RSpec.describe Zelastic::Indexer do | |||
Contributor
Author
There was a problem hiding this comment.
Changes in this file are just rubocop fixes.
| @@ -14,10 +14,10 @@ jobs: | |||
| strategy: | |||
Contributor
Author
There was a problem hiding this comment.
There was a conflict between the latest version of the ubuntu-runner on CI and the ES versions we had pinned in the CI test config.
I have bumped to later versions of ES that have a fix for this conflict.
olly-chadwick-carwow
marked this pull request as ready for review
May 1, 2026 15:40
PChambino
approved these changes
May 1, 2026
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
2 participants
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.
Kanban Card
The
reindex_from_local/reindex_from_remotemethods added in #79 hard-coded the request body to Elasticsearch's defaults:op_type: 'index'(overwrite) andconflicts: 'abort'.We want to use different values for these (
op_type: 'create'andconflicts: 'proceed'), so adding optional kwargs to allow for this. Both kwargs default toniland are omitted from the request body when nil, so existing callers see no behaviour change.