Update version to 7.0.0-alpha1 by rjernst · Pull Request #25876 · elastic/elasticsearch

rjernst · 2017-07-25T05:52:48Z

This commit updates the version for master to 7.0.0-alpha1. It also adds
the 6.1 version constant, and fixes many tests, as well as marking some
as awaits fix.

This commit updates the version for master to 7.0.0-alpha1. It also adds the 6.1 version constant, and fixes many tests, as well as marking some as awaits fix.

rjernst · 2017-07-27T03:19:28Z

I just pushed this branch to elastic/elasticsearch, hopefully someone can take this over as I am out the next 2 days and there are still lingering test failures.

s1monw · 2017-07-27T15:02:35Z

@rjernst I don't see any branch on elastic/elasticsearch is it safe to work off your branch?

rjernst · 2017-07-27T16:39:57Z

Yes please do. Sorry I thought I had pushed it.

In 6.x we had to serialize the 2 byte marker for the transport address type for BWC. Now in 6.x this doesn't exist and we write 2 bytes less when we serialize a transport address to a min compat node. Closes elastic#25893

Closes elastic#25870

martijnvg

Looks good as far as I can see.

ywelsch · 2017-07-28T13:29:55Z

core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java

 import org.elasticsearch.common.lucene.all.AllTermQuery;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.json.JsonXContent;


revert this? I don't see it being used.

ywelsch · 2017-07-28T13:33:10Z

core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java

        // serialize with old version
        outStream = new BytesStreamOutput();
-        outStream.setVersion(Version.CURRENT.minimumIndexCompatibilityVersion());
+        outStream.setVersion(Version.V_5_0_0);


Why V_5_0_0? we should never serialize to such a node?

yeah so I think this test can go away but I didn't wanna do it in this PR.

nik9000

Mostly LGTM. I left a few minors that can be followups and I've marked one file as beyond my ability to properly review so I'd like another set of eyes on it.

nik9000 · 2017-07-28T13:24:28Z

build.gradle

-      ext.projectSubstitutions["org.elasticsearch.distribution.deb:elasticsearch:${indexCompatVersions[-2]}"] = ':distribution:bwc-release-snapshot'
-      ext.projectSubstitutions["org.elasticsearch.distribution.rpm:elasticsearch:${indexCompatVersions[-2]}"] = ':distribution:bwc-release-snapshot'
-      ext.projectSubstitutions["org.elasticsearch.distribution.zip:elasticsearch:${indexCompatVersions[-2]}"] = ':distribution:bwc-release-snapshot'
+      if (indexCompatVersions.size() > 1) {


nik9000 · 2017-07-28T14:32:46Z

build.gradle

-    if (currentVersion != foundVersion) {
+    if (currentVersion != foundVersion
+        && (major == prevMajor || major == currentVersion.major)
+        && (versions.isEmpty() || versions.last() != foundVersion)) {


I think this adds all the betas and rcs are wire and index compatible versions. I think, at least in the end, we want them to only be index and wire compatible if we only have only have them. Otherwise we'll be testing compatibility against betas while we're well into 6.0. Is this a thing we should handle in a followup?

nik9000 · 2017-07-28T14:38:29Z

qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

    private final boolean runningAgainstOldCluster = Booleans.parseBoolean(System.getProperty("tests.is_old_cluster"));
    private final Version oldClusterVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
-    private final boolean supportsLenientBooleans = oldClusterVersion.onOrAfter(Version.V_6_0_0_alpha1);
+    private final boolean supportsLenientBooleans = oldClusterVersion.before(Version.V_6_0_0_alpha1);


nik9000 · 2017-07-28T14:39:47Z

qa/mixed-cluster/src/test/java/org/elasticsearch/backwards/IndexingIT.java

            int numDocs = 0;
            final int numberOfInitialDocs = 1 + randomInt(5);
            logger.info("indexing [{}] docs initially", numberOfInitialDocs);
-            numDocs += indexDocs(index, 0, numberOfInitialDocs);


I'd like someone else to have a look at this file's changes.

@ywelsch did look at it

nik9000 · 2017-07-28T14:42:04Z

test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java

        public static final Version V_6_0_0_alpha1 = Version.fromString("6.0.0-alpha1");
        public static final Version V_6_0_0_alpha2 = Version.fromString("6.0.0-alpha2");
        public static final Version V_6_0_0_beta1 = Version.fromString("6.0.0-beta1");
-        public static final Version CURRENT = V_6_0_0_beta1;


The intent of these tests was to not have to change them when we upgraded unless we found a new kind of layout. So maybe we don't have to change this?

not sure what you mean here?

I'm asking if you have to change this test at all. When I wrote the test I used all the Version.fromString so that you wouldn't have to change the tests as the versions marched along. I intended for the test to stay the same rather than mirror the current branch.

got it - I fixed it

nik9000 · 2017-07-28T14:42:18Z

test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java

-        // Because things blow up all over the place if the minimum compatible version isn't released.
-        // We'll fix this very, very soon. But for now, this hack.
-        // end big horrible hack
+        Version minimumCompatibleVersion = Version.CURRENT.minimumCompatibilityVersion();


s1monw · 2017-07-28T17:54:51Z

@rjernst I think we are ready here. ~~I still have some unaddressed comments from @nik9000 but~~ it should be ready for you to merge when you are back!

imotov · 2017-07-28T18:08:01Z

@s1monw if you bump the version today, could you also bump the version here and here. I didn't want to backported it before running tests for a bit. So, it is currently only merged into master and if you start running 7.0.0 upgrade from 6.0.0 test, it might fail since the 6.0 branch doesn't have it. I will backport everything on Monday or over the weekend and change the version appropriately.

This reverts commit ce8333b.

s1monw · 2017-07-29T06:08:09Z

@imotov I merged master into this and bumped the version.

s1monw

LGTM

…#13196) This reverts commit ce8333b.

elasticmachine · 2019-01-29T12:39:18Z

Pinging @elastic/es-core-infra

Update version to 7.0.0-alpha1

9dafe7d

This commit updates the version for master to 7.0.0-alpha1. It also adds the 6.1 version constant, and fixes many tests, as well as marking some as awaits fix.

rjernst added the v7.0.0 label Jul 25, 2017

fix precommit

1cf8a14

spalger added a commit to elastic/kibana that referenced this pull request Jul 25, 2017

override version until elastic/elasticsearch#25876 is merged

ce8333b

rjernst added 3 commits July 25, 2017 19:40

more test fixes

092d749

more test fixes

793013e

Merge branch 'master' into bump7

f829ed2

Merge branch 'master' into bump7

0a014cf

s1monw added 2 commits July 28, 2017 10:39

make sure default analyzer is always referenced by name [default]

a4df8db

Fix expected bytes in tests due to new major version

d6e2c06

In 6.x we had to serialize the 2 byte marker for the transport address type for BWC. Now in 6.x this doesn't exist and we write 2 bytes less when we serialize a transport address to a min compat node. Closes elastic#25893

s1monw mentioned this pull request Jul 28, 2017

Tcp and nio transport test failures on version bump to 7.0 #25893

Closed

s1monw added 3 commits July 28, 2017 11:15

add back exception when spcifying broken setting for defautl analyzer

d01c7a2

Pass in explicit version

22f7077

Closes elastic#25870

fix translog tests

b0e4031

martijnvg approved these changes Jul 28, 2017

View reviewed changes

ywelsch reviewed Jul 28, 2017

View reviewed changes

s1monw added 4 commits July 28, 2017 15:43

fix test

5685bcc

revert unnecessary import

7c9b734

fix IndexingIT

2defa14

Merge branch 'master' into bump7

268417a

s1monw mentioned this pull request Jul 28, 2017

IndexingIT fails on master after version bump to 7.0 #25873

Closed

nik9000 reviewed Jul 28, 2017

View reviewed changes

s1monw added 2 commits July 28, 2017 16:43

remove fixme

b8f1162

fix test to remove old version that area not relevant

cd3a0a4

epixa added a commit to epixa/kibana that referenced this pull request Jul 28, 2017

Revert "override version until elastic/elasticsearch#25876 is merged"

eb11ad6

This reverts commit ce8333b.

epixa mentioned this pull request Jul 28, 2017

Bump version back to 7.0.0-alpha1 elastic/kibana#13196

Merged

s1monw added 2 commits July 29, 2017 08:05

Merge branch 'master' into bump7

ab11b83

bump version in SnapshotInProgress

37fa923

revert unnecessary changes

24431fb

s1monw approved these changes Jul 29, 2017

View reviewed changes

javanna mentioned this pull request Jul 31, 2017

[DOCS] add links to javadoc in clients docs pages #25745

Merged

nik9000 approved these changes Jul 31, 2017

View reviewed changes

Merge branch 'master' into bump7

22d8054

rjernst merged commit 072281d into elastic:master Aug 1, 2017

rjernst deleted the bump7 branch August 1, 2017 19:47

tylersmalley pushed a commit to elastic/kibana that referenced this pull request Aug 2, 2017

Revert "override version until elastic/elasticsearch#25876 is merged" (…

c33ac75

…#13196) This reverts commit ce8333b.

jpountz added >non-issue :Delivery/Build Build or test infrastructure labels Jan 29, 2019

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

Conversation

rjernst commented Jul 25, 2017

Uh oh!

rjernst commented Jul 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

s1monw commented Jul 27, 2017

Uh oh!

rjernst commented Jul 27, 2017

Uh oh!

martijnvg left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nik9000 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s1monw commented Jul 28, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

imotov commented Jul 28, 2017

Uh oh!

s1monw commented Jul 29, 2017

Uh oh!

s1monw left a comment

Choose a reason for hiding this comment

Uh oh!

elasticmachine commented Jan 29, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

rjernst commented Jul 27, 2017 •

edited

Loading

s1monw commented Jul 28, 2017 •

edited

Loading