Rollup: Skip cleanup if nodes too old#34657
Merged
nik9000 merged 1 commit intoelastic:6.xfrom Oct 25, 2018
Merged
Conversation
Skips the rollup cleanup at the end of every test if some of the nodes in the test cluster have a version before rollup was released. As a side effect of doing this, I move the "is x-pack installed" test from on-demand to before the first test. This should result in less requests in general and it makes is a little simpler to store the node versions and whether or not any node has x-pack installed. I expect other cleanup code will be able to use this version checking infrastructure. In addition, I think the yml tests could also reuse it. They have some fairly complex logic to look up the versions of nodes but I don't believe it is required. Both of those will have to wait for a follow up change. Closes elastic#34629
Collaborator
|
Pinging @elastic/es-core-infra |
Collaborator
|
Pinging @elastic/es-search-aggs |
Member
Author
|
Note: I opened this against 6.x because that is where the actual problem occurs. I'll forward port it so master lines up once we approve it. |
talevy
approved these changes
Oct 19, 2018
Contributor
talevy
left a comment
There was a problem hiding this comment.
left a couple of minor comments, but LGTM
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
Show resolved
Hide resolved
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
Show resolved
Hide resolved
Member
Author
|
@elasticmachine, retest this please |
Member
Author
|
I merged this to master, stripping out some of the BWC code that isn't useful there but keeping the version fetching. |
nik9000
added a commit
that referenced
this pull request
Oct 25, 2018
This is a forward port of a change made to clean up backwards compatibility for the rollup cleanups. It makes the version of each node available very early on in test execution. The 6.x version of the change used those versions to control the cleanup backwards compatibility but that isn't needed in this branch. But having the versions around *is* useful. So this makes them available. Closes #34629
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Oct 26, 2018
* master: (74 commits) XContent: Check for bad parsers (elastic#34561) Docs: Align prose with snippet (elastic#34839) document the search context is freed if the scroll is not extended (elastic#34739) Test: Lookup node versions on rest test start (elastic#34657) SQL: Return error with ORDER BY on non-grouped. (elastic#34855) Reduce channels in AbstractSimpleTransportTestCase (elastic#34863) [DOCS] Updates Elasticsearch monitoring tasks (elastic#34339) Check self references in metric agg after last doc collection (elastic#33593) (elastic#34001) [Docs] Add `indices.query.bool.max_clause_count` setting (elastic#34779) Add 6.6.0 version to master (elastic#34847) Test: ensure char[] doesn't being with prefix (elastic#34816) Remove static import from HLRC doc snippet (elastic#34834) Logging: server: clean up logging (elastic#34593) Logging: tests: clean up logging (elastic#34606) SQL: Fix edge case: `<field> IN (null)` (elastic#34802) [Test] Mute FullClusterRestartIT.testShrink() until test is fixed SQL: Introduce ODBC mode, similar to JDBC (elastic#34825) SQL: handle X-Pack or X-Pack SQL not being available in a more graceful way (elastic#34736) [Docs] Add explanation for code snippets line width (elastic#34796) CCR: Rename follow-task parameters and stats (elastic#34836) ...
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
This is a forward port of a change made to clean up backwards compatibility for the rollup cleanups. It makes the version of each node available very early on in test execution. The 6.x version of the change used those versions to control the cleanup backwards compatibility but that isn't needed in this branch. But having the versions around *is* useful. So this makes them available. Closes #34629
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Skips the rollup cleanup at the end of every test if some of the nodes
in the test cluster have a version before rollup was released.
As a side effect of doing this, I move the "is x-pack installed" test
from on-demand to before the first test. This should result in less
requests in general and it makes is a little simpler to store the node
versions and whether or not any node has x-pack installed.
I expect other cleanup code will be able to use this version checking
infrastructure. In addition, I think the yml tests could also reuse it.
They have some fairly complex logic to look up the versions of nodes but
I don't believe it is required. Both of those will have to wait for a
follow up change.
Closes #34629