Skip to content
Merged
Changes from 1 commit
Commits
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
7 changes: 5 additions & 2 deletions docs/reference/docs/reindex.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,11 @@ POST _reindex
// CONSOLE
// TEST[setup:twitter]

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

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 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

and return a count of version conflicts encountered:

[source,js]
--------------------------------------------------
Expand Down