Skip to content
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.

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

Reindex conflicts clarification (docs) #40442

Merged

Conversation

henningandersen
Copy link
Contributor

Made it more clear that conflicts : proceed only affects version
conflicts.

Relates to #17617

Made it more clear that conflicts : proceed only affects version
conflicts.
@henningandersen henningandersen added >docs General docs changes :Distributed Indexing/CRUD A catch all label for issues around indexing, updating and getting a doc by id. Not search. v8.0.0 labels Mar 26, 2019
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed

By default, version conflicts abort the `_reindex` process, but you can just
count them by setting `"conflicts": "proceed"` in the request body:
By default, version conflicts abort the `_reindex` process. The `"conflicts"` request body
parameter can be used to instruct `_reindex` to proceed with next document on version conflicts.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion:
parameter can be used to instruct _reindex to proceed with the next document on version conflicts.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 7f76ba8

count them by setting `"conflicts": "proceed"` in the request body:
By default, version conflicts abort the `_reindex` process. The `"conflicts"` request body
parameter can be used to instruct `_reindex` to proceed with next document on version conflicts.
Notice that the handling of other types of errors is unaffected by the `"conflicts"` parameter.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion:
The handling of other types of errors is unaffected by the "conflicts" parameter.

I think that the Notice that part is unnecessary and feels weird for this documentation. If you do want emphasis, I would probably go with "It is important to note that the handling of other error types is unaffected by the..."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I opted for keeping the emphasis with your modified text. The whole point of this PR was this note, since that was the clarification asked for in the issue. See 7f76ba8

By default, version conflicts abort the `_reindex` process. The `"conflicts"` request body
parameter can be used to instruct `_reindex` to proceed with next document on version conflicts.
Notice that the handling of other types of errors is unaffected by the `"conflicts"` parameter.
By setting `"conflicts": "proceed"` in the request body the `_reindex` process will continue on version conflicts
Copy link
Contributor

Choose a reason for hiding this comment

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

This is confusing because "By setting...the _reindex process will continue" seems to suggest that it is the process that is setting the parameter.

Suggestion:
When "conflicts": "proceed" is set in the request body, the _reindex process will continue on version conflicts

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, so good to have native speakers review docs, fixed in 7f76ba8

@henningandersen
Copy link
Contributor Author

Thanks @tbrooks8 , this should be ready for another look.

Copy link
Contributor

@Tim-Brooks Tim-Brooks left a comment

Choose a reason for hiding this comment

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

LGTM

@henningandersen henningandersen merged commit e24fd1b into elastic:master Mar 29, 2019
henningandersen added a commit that referenced this pull request Mar 31, 2019
Made it more clear that conflicts : proceed only affects version
conflicts.
henningandersen added a commit that referenced this pull request Mar 31, 2019
Made it more clear that conflicts : proceed only affects version
conflicts.
@henningandersen
Copy link
Contributor Author

henningandersen commented Mar 31, 2019

Backported to 7.x, 7.0 and 6.7.

jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Apr 1, 2019
* elastic/7.0:
  [TEST] Mute WebhookHttpsIntegrationTests.testHttps
  [DOCS] Add 'time value' links to several monitor settings (elastic#40633) (elastic#40687)
  Do not perform cleanup if Manifest write fails with dirty exception (elastic#40519)
  Remove mention of soft deletes from getting started (elastic#40668)
  Fix bug in detecting use of bundled JDK on macOS
  Reindex conflicts clarification (docs) (elastic#40442)
  SQL: [Tests] Enable integration tests for fixed issues (elastic#40664)
  Add information about the default sort mode (elastic#40657)
  SQL: [Docs] Fix example for CURDATE
  SQL: [Docs] Fix doc errors regarding CURRENT_DATE. (elastic#40649)
  Clarify using time_zone and date math in range query (elastic#40655)
  Add notice for bundled jdk (elastic#40576)
  disable kerberos test until kerberos fixture is working again
  [DOCS] Use "source" instead of "inline" in ML docs (elastic#40635)
  Unmute and fix testSubParserArray (elastic#40626)
  Geo Point parse error fix (elastic#40447)
  Increase suite timeout to 30 minutes for docs tests (elastic#40521)
  Fix repository-hdfs when no docker and unnecesary fixture
  Avoid building hdfs-fixure use an image that works instead
henningandersen added a commit that referenced this pull request Apr 8, 2019
Made it more clear that conflicts : proceed only affects version
conflicts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Distributed Indexing/CRUD A catch all label for issues around indexing, updating and getting a doc by id. Not search. >docs General docs changes v6.7.1 v7.0.0-rc2 v7.2.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants