Consolidate version-numbering semantics #27397

DaveCTurner · 2017-11-21T16:35:15Z

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.

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 #27397, and another is a back port of d5e56c5 which is related to #27251.

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.

…f versions

…versionCollection where needed

…as required

nik9000 · 2017-11-22T16:32:10Z

build.gradle

+  }
+  final def bwcPreviousReleaseSnapshot = versionCollection.BWCSnapshotForPreviousMinorOfCurrentMajor
+  if (bwcPreviousReleaseSnapshot != null) {
+    throw new NotImplementedException(


Gah, the version bump to 6.2.0 just got pushed, so now I can't merge this without throwing this exception. :(

nik9000 · 2017-11-22T16:33:37Z

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -107,7 +107,8 @@ class VagrantTestPlugin implements Plugin<Project> {
        if (upgradeFromVersion == null) {
            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


We've been mostly avoiding def in .groovy files so they are more "java-like". Can you use the type here?

Sure, no probs

…tMajor not yet being a project

… layer

Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.

DaveCTurner · 2017-11-23T17:35:43Z

@martijnvg Jenkins and I are happy about this. Hopefully your test run is too.

martijnvg

@DaveCTurner My test run (gradle bwcTest) was happy too.

Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.

DaveCTurner · 2017-11-23T20:32:59Z

Merged and backported:

89ba899 on master
27ae6ac on 6.x
a762da6 on 6.1
2c72681 on 6.0

Closes #27497

* 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) ...

* 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 ...

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

DaveCTurner self-assigned this Nov 15, 2017

DaveCTurner added v6.1.0 :Delivery/Build Build or test infrastructure labels Nov 15, 2017

DaveCTurner added v6.0.1 v7.0.0 >test Issues or PRs that are addressing/adding tests labels Nov 19, 2017

DaveCTurner added 9 commits November 21, 2017 08:26

Unused imports

d50a7e4

Typo

d232d2f

Rename version number component 'bugfix' to 'revision'

d858eb4

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.

Extract logic for reading Version.java out of build.gradle

dd5eb22

Add calculations of snapshots for BWC testing

d9a1564

Convert VersionUtils into VersionCollection, encapsulating the list o…

53b0e57

…f versions

Get rid of indexCompatVersions and wireCompatVersions and simply use …

1e60605

…versionCollection where needed

Add hack for testing vs different Version.java files

403debd

Fail if versionCollection.BWCSnapshotForPreviousMinorOfCurrentMajor w…

1c66e9a

…as required

DaveCTurner added the blocker label Nov 21, 2017

DaveCTurner added 4 commits November 22, 2017 14:43

Add tests of VersionCollection

ef0fa0e

Expand import *

9e1dc82

Get rid of tests for VersionCollection

e591919

Merge branch 'master' into 2017-11-20-version-numbering

f53ae09

DaveCTurner requested a review from nik9000 November 22, 2017 16:14

nik9000 approved these changes Nov 22, 2017

View reviewed changes

DaveCTurner added 6 commits November 22, 2017 16:51

Resolve TODO: only check out the known snapshots

f93e7bc

Add comments

05c6956

Explicit types

ee1ce49

Stop failing on versionCollection.BWCSnapshotForPreviousMinorOfCurren…

3fac5d7

…tMajor not yet being a project

Merge branch 'master' into 2017-11-20-version-numbering

0f7f8aa

Merge branch 'master' into 2017-11-20-version-numbering

5643e08

Just check out into the dummy project directory, no need for an extra…

27810c3

… layer

DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Nov 23, 2017

Consolidate version numbering semantics (elastic#27397)

2c72681

Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.

DaveCTurner requested a review from martijnvg November 23, 2017 17:34

martijnvg approved these changes Nov 23, 2017

View reviewed changes

DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Nov 23, 2017

Consolidate version numbering semantics (elastic#27397)

89ba899

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

Consolidate version numbering semantics (#27397)

27ae6ac

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

Consolidate version numbering semantics (#27397)

a762da6

Fixes to the build system, particularly around BWC testing, and to make future version bumps less painful.

DaveCTurner closed this Nov 23, 2017

This was referenced Nov 23, 2017

Remove unused getBWCSnapshotForPreviousMinorOfCurrentMajor #27508

Merged

QueryBuilderBWCIT failing on 6.x #27510

Closed

Release tests failing on master #27512

Merged

martijnvg added a commit that referenced this pull request Nov 24, 2017

unmuted test, this has been fixed by #27397

f1ebf36

Closes #27497

DaveCTurner mentioned this pull request Nov 24, 2017

Cannot find 7.0.0-alpha1-SNAPSHOT/maven-metadata.xml and friends elastic/elasticsearch-hadoop#1077

Closed

alpar-t mentioned this pull request Jul 18, 2018

Make the build version qualifier aware #32128

Closed

jimczi added v7.0.0-beta1 and removed v7.0.0 labels Feb 7, 2019

mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020

DaveCTurner deleted the 2017-11-20-version-numbering branch July 23, 2022 10:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Consolidate version-numbering semantics #27397

Consolidate version-numbering semantics #27397

Uh oh!

DaveCTurner commented Nov 21, 2017

Uh oh!

nik9000 Nov 22, 2017

Uh oh!

DaveCTurner Nov 22, 2017

Uh oh!

nik9000 Nov 22, 2017

Uh oh!

DaveCTurner Nov 22, 2017

Uh oh!

DaveCTurner commented Nov 23, 2017

Uh oh!

martijnvg left a comment

Uh oh!

DaveCTurner commented Nov 23, 2017

Uh oh!

Uh oh!

Consolidate version-numbering semantics #27397

Consolidate version-numbering semantics #27397

Uh oh!

Conversation

DaveCTurner commented Nov 21, 2017

Uh oh!

nik9000 Nov 22, 2017

Choose a reason for hiding this comment

Uh oh!

DaveCTurner Nov 22, 2017

Choose a reason for hiding this comment

Uh oh!

nik9000 Nov 22, 2017

Choose a reason for hiding this comment

Uh oh!

DaveCTurner Nov 22, 2017

Choose a reason for hiding this comment

Uh oh!

DaveCTurner commented Nov 23, 2017

Uh oh!

martijnvg left a comment

Choose a reason for hiding this comment

Uh oh!

DaveCTurner commented Nov 23, 2017

Uh oh!

Uh oh!