-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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
Merge thread count is per shard. Closes #28518 #29686
Merge thread count is per shard. Closes #28518 #29686
Conversation
Pinging @elastic/es-distributed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @Sue-Gallagher . I think something went wrong with git and there are unintended changes in the pr.
@@ -3,14 +3,23 @@ | |||
|
|||
APIs in Elasticsearch accept an index name when working against a | |||
specific index, and several indices when applicable. The index aliases | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
something went wrong here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I know, and I'm sorry. As a result of being a newbie to both Elastic and Git, I've created a monster that's bent on haunting me forever. Deb has been guiding me on a twisted path toward a solution, and we hope to have it tamed in the next day or two (fingers crossed).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hehe... no worries. When you have tamed the git monster, please teach me too :)
docs/reference/mapping.asciidoc
Outdated
@@ -20,8 +20,6 @@ are stored and indexed. For instance, use mappings to define: | |||
Each index has one _mapping type_ which determines how the document will be | |||
indexed. | |||
|
|||
deprecated[6.0.0,See <<removal-of-types>>]. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unrelevant change?
@@ -228,8 +228,13 @@ explicitly ignore them, as for the purposes of document similarity it seems | |||
reasonable to assume that "a stop word is never interesting". | |||
|
|||
`analyzer`:: | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same
08e8858
to
5e38f98
Compare
LGTM |
PR updated to remove extraneous commit.
…st-variables * origin/master: Test: Switch painless test to 1 shard CCS: Drop http address from remote cluster info (elastic#29568) Reindex: Fold "from old" tests into reindex module (elastic#30142) Convert FieldCapabilitiesResponse to a ToXContentObject. (elastic#30182) [DOCS] Added 'on a single shard' to description of max_thread_count. Closes 28518 (elastic#29686) [TEST] Redirect links to new locations (elastic#30179)
* master: (7173 commits) Bump changelog version to 6.4 (elastic#30217) [DOCS] Adds native realm security settings (elastic#30186) Test: Switch painless test to 1 shard CCS: Drop http address from remote cluster info (elastic#29568) Reindex: Fold "from old" tests into reindex module (elastic#30142) Convert FieldCapabilitiesResponse to a ToXContentObject. (elastic#30182) [DOCS] Added 'on a single shard' to description of max_thread_count. Closes 28518 (elastic#29686) [TEST] Redirect links to new locations (elastic#30179) Move repository-s3 fixture tests to QA test project (elastic#29372) Fail snapshot operations early on repository corruption (elastic#30140) Docs: Document `failures` on reindex and friends Build global ordinals terms bucket from matching ordinals (elastic#30166) Watcher: Ensure mail message ids are unique per watch action (elastic#30112) REST: Remove GET support for clear cache indices (elastic#29525) SQL: Correct error message (elastic#30138) Require acknowledgement to start_trial license (elastic#30135) Fix a bug in FieldCapabilitiesRequest#equals and hashCode. (elastic#30181) SQL: Add BinaryMathProcessor to named writeables list (elastic#30127) Tests: Use buildDir as base for generated-resources (elastic#30191) Fix SliceBuilderTests#testRandom failures ...
[DOCS] Added "on a single shard" to description of index.merge.scheduler.max_thread_count. Closes 28518