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

Ensure that the output of node roles are sorted #54376

Merged
merged 4 commits into from
Mar 28, 2020

Conversation

jasontedor
Copy link
Member

@jasontedor jasontedor commented Mar 28, 2020

This commit ensures that node roles are sorted by node role name, which makes the output easier to consume, and also makes it easier to rely on the behavior of the output in assertions.

Relates #54370

This commit ensures that node roles are sorted by node role name, which
makes the output easier to consume, and also makes it easier to rely on
the behavior of the output in assertions.
@jasontedor jasontedor requested a review from rjernst March 28, 2020 12:58
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (:Core/Infra/Core)

Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

Lgtm

@jasontedor jasontedor merged commit 489c709 into elastic:master Mar 28, 2020
@jasontedor jasontedor deleted the sort-node-roles branch March 28, 2020 16:51
jasontedor added a commit that referenced this pull request Mar 28, 2020
This commit ensures that node roles are sorted by node role name, which
makes the output easier to consume, and also makes it easier to rely on
the behavior of the output in assertions.
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Mar 30, 2020
* upstream/master: (447 commits)
  Adjust BWC version on node roles being sorted
  Deprecate node local storage setting (elastic#54374)
  Remove Unused BaseNodeRequest (elastic#54323)
  Decouple environment from DiscoveryNode (elastic#54373)
  Ensure that the output of node roles are sorted (elastic#54376)
  Do not stash environment in security (elastic#54372)
  Do not stash environment in machine learning (elastic#54371)
  Clean up how pipeline aggs check for multi-bucket (elastic#54161)
  Remove toString from Painless user tree nodes (elastic#54117)
  Docs: Use splitOnToken instead of custom function (elastic#48408)
  bwc: enable script cache in node stats (elastic#54362)
  bwc: Mute for script cache in node stats (elastic#54359)
  Test to enforce response to invalid data stream names
  Scripting: Use randomValueOtherThan in stats test (elastic#54356)
  Move transport decoding and aggregation to server (elastic#48263)
  Mute ScriptServiceTests.testContextCacheStats (elastic#54352)
  Improve checkstyle performance and readability (elastic#54308)
  Disable Gradle daemon when executing Windows packaging tests (elastic#54316)
  [Docs] Minor fix for SubmitAsyncSearchRequest.keepOnCompletion javadoc (elastic#54325)
  [DOCS] Fix typos in top metrics agg docs (elastic#54299)
  ...

Conflicts:
	server/src/main/java/org/elasticsearch/index/IndexModule.java
	server/src/main/java/org/elasticsearch/index/IndexService.java
	server/src/main/java/org/elasticsearch/indices/IndicesService.java
	server/src/test/java/org/elasticsearch/index/IndexModuleTests.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants