Remove Version 6 pre-release constants #41517
Merged
Conversation
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
cbuescher
added
:Core/Infra/Core
Collaborator
|
Pinging @elastic/es-core-infra |
cbuescher
force-pushed
the
remove-6.0.x-constant
branch
from
4e11423 to
352ecd4
Compare
cbuescher
force-pushed
the
remove-6.0.x-constant
branch
from
352ecd4 to
c311574
Compare
rjernst
reviewed
Apr 25, 2019
Member
rjernst
left a comment
rjernst
left a comment
There was a problem hiding this comment.
Thanks for helping out here! I left a handful of comments. The major issue is we shouldn't really have any new uses of the v7.0.0 constant. Instead, those test uses should be converted to using an appropriate version through VersionUtils, or using Version.CURRENT.minimumIndexCompatibleVersion().
server/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/translog/Translog.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java
Outdated
Show resolved
Hide resolved
added 2 commits
April 26, 2019 11:00
Member
Author
|
Thanks @rjernst, I pushed updates that should adress your comments. |
Member
Author
|
@rjernst this would be ready for another look if you have the time |
rjernst
requested changes
May 6, 2019
Member
rjernst
left a comment
rjernst
left a comment
There was a problem hiding this comment.
Looks better, but there are still some hardcoded constant usages.
server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/TokenMetaData.java
Outdated
Show resolved
Hide resolved
...ava/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
Outdated
Show resolved
Hide resolved
...va/org/elasticsearch/xpack/monitoring/collector/indices/IndexRecoveryMonitoringDocTests.java
Outdated
Show resolved
Hide resolved
Member
Author
|
@rjernst thanks for the update, I pushed another commit that should adress your last comments. |
rjernst
reviewed
May 7, 2019
Member
There was a problem hiding this comment.
Thanks @cbuescher. There are a just a few remaining places I see using the hardcoded version constants.
server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java
Outdated
Show resolved
Hide resolved
server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java
Outdated
Show resolved
Hide resolved
test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
Outdated
Show resolved
Hide resolved
...ava/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
Outdated
Show resolved
Hide resolved
cbuescher
force-pushed
the
remove-6.0.x-constant
branch
from
d406d64 to
7b84d64
Compare
Member
Author
|
@rjernst looks ready for another round. |
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
May 9, 2019
…rsing * elastic/master: [ML] relax set upgrade mode test to match what is guaranteed (elastic#41958) Add note about ILM action ordering (elastic#41771) Remove Version 6 pre-release constants (elastic#41517) Mute illegal interval rollup tests Add static section whitelist info to api docs generation (elastic#41870) Cleanup RollupSearch exceptions, disallow partial results (elastic#41272)
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
Now that master is 8.0, we can remove uses of these constants and the backcompat code that uses them, since 8 will always walk to 7.0+ nodes. This PR starts by removing the pre-6 release constants, remove obsolete code and replacing its occurances in tests where needed. Relates to elastic#41164
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Now that master is 8.0, we can remove uses of these constants and the
backcompat code that uses them, since 8 will always walk to 7.0+ nodes.
This PR starts by removing the pre-6 release constants, remove obsolete code
and replacing its occurances in tests where needed.
Relates to #41164