Remove the 6.7 version constants. #42039
Merged
Conversation
This file contains 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
jtibshirani
added
:Core/Infra/Core
|
Pinging @elastic/es-core-infra |
jtibshirani
force-pushed
the
remove-version-constant
branch
4 times, most recently
from
e83b021 to
ba3f5ba
Compare
jtibshirani
force-pushed
the
remove-version-constant
branch
from
ba3f5ba to
83da48c
Compare
talevy
approved these changes
May 13, 2019
| @@ -886,7 +886,7 @@ public void testShardLockObtainFailedException() throws IOException { | |||
|
|
|||
| public void testSnapshotInProgressException() throws IOException { | |||
| SnapshotInProgressException orig = new SnapshotInProgressException("boom"); | |||
| Version version = VersionUtils.randomVersionBetween(random(), Version.V_6_7_0, Version.CURRENT); | |||
| Version version = VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT); | |||
There was a problem hiding this comment.
no need to do here, but we could probably replace this so that we do not need to worry about it in the big 7.x refactor.
to something like
Version version = Versionutils.randomVersion()
There was a problem hiding this comment.
I think it should be VersionUtils.randomIndexCompatibleVersion(random())
There was a problem hiding this comment.
👍 I'll make this change in the current PR.
| @@ -143,7 +143,7 @@ public void setupClient() { | |||
| // tokens docs on a separate index), let's test the TokenService works in a mixed cluster with nodes with versions prior to these | |||
| // developments | |||
| if (randomBoolean()) { | |||
| oldNode = addAnotherDataNodeWithVersion(this.clusterService, randomFrom(Version.V_6_7_0, Version.V_7_0_0)); | |||
| oldNode = addAnotherDataNodeWithVersion(this.clusterService, Version.V_7_0_0); | |||
There was a problem hiding this comment.
should this be a range like so?
oldNode = addAnotherDataNodeWithVersion(this.clusterService, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.V_7_1_0));
There was a problem hiding this comment.
Makes sense given the comment above, will update this too.
|
@elasticmachine run elasticsearch-ci/packaging-sample |
|
@elasticmachine run elasticsearch-ci/1 |
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
This PR removes all constants of the form `Version.V_6_7_*`, since master no longer needs to account for them. Relates to elastic#41164.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR removes all constants of the form
Version.V_6_7_*, since master nolonger needs to account for them.
Relates to #41164.