Consolidate version-numbering semantics#27397
Closed
DaveCTurner wants to merge 28 commits intoelastic:masterfrom
Closed
Consolidate version-numbering semantics#27397DaveCTurner wants to merge 28 commits intoelastic:masterfrom
DaveCTurner wants to merge 28 commits intoelastic:masterfrom
Conversation
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Nov 15, 2017
An attempt to bump to 6.0.1 on the 6.0 branch exposed up a handful of issues that this commit fixes. One of those fixes is a terrible hack that will be fixed more thoroughly in elastic#27397, and another is a back port of d5e56c5 which is related to elastic#27251.
It's called `revision` in `Version.java` and `bugfix` in `Version.groovy` which is a source of some confusion. `revision` seems more correct - it's not just about fixing bugs.
…versionCollection where needed
nik9000
approved these changes
Nov 22, 2017
build.gradle
Outdated
| } | ||
| final def bwcPreviousReleaseSnapshot = versionCollection.BWCSnapshotForPreviousMinorOfCurrentMajor | ||
| if (bwcPreviousReleaseSnapshot != null) { | ||
| throw new NotImplementedException( |
Member
Author
There was a problem hiding this comment.
Gah, the version bump to 6.2.0 just got pushed, so now I can't merge this without throwing this exception. :(
| String firstPartOfSeed = project.rootProject.testSeed.tokenize(':').get(0) | ||
| final long seed = Long.parseUnsignedLong(firstPartOfSeed, 16) | ||
| upgradeFromVersion = project.indexCompatVersions[new Random(seed).nextInt(project.indexCompatVersions.size())] | ||
| final def indexCompatVersions = project.versionCollection.versionsIndexCompatibleWithCurrent |
Member
There was a problem hiding this comment.
We've been mostly avoiding def in .groovy files so they are more "java-like". Can you use the type here?
…tMajor not yet being a project
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Nov 23, 2017
Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.
Member
Author
|
@martijnvg Jenkins and I are happy about this. Hopefully your test run is too. |
martijnvg
approved these changes
Nov 23, 2017
Member
martijnvg
left a comment
There was a problem hiding this comment.
@DaveCTurner My test run (gradle bwcTest) was happy too.
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Nov 23, 2017
Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.
DaveCTurner
added a commit
that referenced
this pull request
Nov 23, 2017
Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.
DaveCTurner
added a commit
that referenced
this pull request
Nov 23, 2017
Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.
Member
Author
This was referenced Nov 23, 2017
martijnvg
added a commit
that referenced
this pull request
Nov 24, 2017
martijnvg
added a commit
that referenced
this pull request
Nov 24, 2017
* es/master: (38 commits) Backport wait_for_initialiazing_shards to cluster health API Carry over version map size to prevent excessive resizing (#27516) Fix scroll query with a sort that is a prefix of the index sort (#27498) Delete shard store files before restoring a snapshot (#27476) Replace `delimited_payload_filter` by `delimited_payload` (#26625) CURRENT should not be a -SNAPSHOT version if build.snapshot is false (#27512) Fix merging of _meta field (#27352) Remove unused method (#27508) unmuted test, this has been fixed by #27397 Consolidate version numbering semantics (#27397) Add wait_for_no_initializing_shards to cluster health API (#27489) [TEST] use routing partition size based on the max routing shards of the second split Adjust CombinedDeletionPolicy for multiple commits (#27456) Update composite-aggregation.asciidoc Deprecate `levenstein` in favor of `levenshtein` (#27409) Automatically prepare indices for splitting (#27451) Validate `op_type` for `_create` (#27483) Minor ShapeBuilder cleanup muted test Decouple nio constructs from the tcp transport (#27484) ...
martijnvg
added a commit
that referenced
this pull request
Nov 24, 2017
* es/6.x: (30 commits) Add wait_for_no_initializing_shards to cluster health API (#27489) Carry over version map size to prevent excessive resizing (#27516) Fix scroll query with a sort that is a prefix of the index sort (#27498) Delete shard store files before restoring a snapshot (#27476) CURRENT should not be a -SNAPSHOT version if build.snapshot is false (#27512) Fix merging of _meta field (#27352) test: do not run percolator query builder bwc test against 5.x versions Remove unused method (#27508) Consolidate version numbering semantics (#27397) Adjust CombinedDeletionPolicy for multiple commits (#27456) Minor ShapeBuilder cleanup [GEO] Deprecate ShapeBuilders and decouple geojson parse logic Improve docs for split API in 6.1/6.x (#27504) test: use correct pre 6.0.0-alpha1 format Update composite-aggregation.asciidoc Deprecate `levenstein` in favor of `levenshtein` (#27409) Decouple nio constructs from the tcp transport (#27484) Bump version from 6.1 to 6.2 Fix whitespace in Security.java Tighten which classes can exit ...
alpar-t
added a commit
that referenced
this pull request
Jul 18, 2018
Implement buildSrc Version in java - This allows to move all all .java files from .groovy. - Will prevent eclipse from tangling up in this setup - make it possible to use Version from Java This backport pulls in some changes from the non backported #27397 but that should be fine
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.
At the moment we interpret version numbers, and our expectations for things like which unreleased versions there are and on which branches their code lives, in a number of different places. These various interpretations are not obviously equivalent, and the bump to 6.0.1 certainly uncovered some issues in this code. The way that some of the issues were fixed will bite us at the bump to 6.0.2.
The plan is to consolidate this logic into one place, and test it more thoroughly, to avoid this kind of thing catching us out in future.