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

DOCS: Make ellipsis optional in /cat/thread_pool #33186

Merged
merged 3 commits into from
Aug 27, 2018

Conversation

dnhatn
Copy link
Member

@dnhatn dnhatn commented Aug 27, 2018

The fix proposed in #31442 fails with the oss distro because the added
3dots does not match anything with the default oss while a 3dots
expression requires matching at least one thread pool.

This change makes a 3dots optional so the thread_pool list can match
both the oss distro (without ccr) and default distro (with ccr).

Relates #31442

The fix proposed in elastic#31442 fails with the oss distro because the added
3dots does not match anything with the default oss while a 3dots
expression requires matching at least one thread pool.

This change adjusts the thread pool list so that it can match both the
oss (without ccr) and default distro (with ccr).
@dnhatn dnhatn added >feature >docs General docs changes :Distributed Indexing/CCR Issues around the Cross Cluster State Replication features labels Aug 27, 2018
@dnhatn dnhatn requested a review from jasontedor August 27, 2018 19:07
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

I left a comment.

@@ -16,10 +16,11 @@ Which looks like:
--------------------------------------------------
node-0 analyze 0 0 0
...
Copy link
Member

Choose a reason for hiding this comment

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

Hmm...I was thinking instead we should make the ... translate to an optional pattern that would match the specified thread pool format (node-\d+ \S+ \d+ \d+ \d+). That way we do not have to require there be a thread pool between analyze and fetch_shard_started.

@dnhatn dnhatn changed the title DOCS: Adjust /cat/thread_pool expectation with ccr DOCS: Make 3dots optional in /cat/thread_pool Aug 27, 2018
@dnhatn
Copy link
Member Author

dnhatn commented Aug 27, 2018

@jasontedor Yep, I've made 3dots optional!

Copy link
Member

@jasontedor jasontedor left a comment

Choose a reason for hiding this comment

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

LGTM!

@dnhatn
Copy link
Member Author

dnhatn commented Aug 27, 2018

Thanks @jasontedor for reviewing!

@dnhatn dnhatn merged commit 5b11df9 into elastic:ccr Aug 27, 2018
@dnhatn dnhatn deleted the fix-doc-thread-pool branch August 27, 2018 22:34
dnhatn added a commit that referenced this pull request Aug 27, 2018
The fix proposed in #31442 fails with the oss distro because the added
3dots does not match anything with the default oss while a 3dots
expression requires matching at least one thread pool.

This change makes an ellipsis optional so the thread_pool list can match
both the oss distro (without ccr) and default distro (with ccr).

Relates #31442
@dnhatn dnhatn changed the title DOCS: Make 3dots optional in /cat/thread_pool DOCS: Make ellipsis optional in /cat/thread_pool Aug 27, 2018
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Aug 27, 2018
* ccr:
  DOCS: Make ellipsis optional in /cat/thread_pool (elastic#33186)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Distributed Indexing/CCR Issues around the Cross Cluster State Replication features >docs General docs changes >feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants