Add 7.1 version constant to 7.x branch #38513

jasontedor · 2019-02-06T13:43:21Z

This commit adds the 7.1 version constant to the 7.x branch.

jasontedor · 2019-02-06T13:44:22Z

This fails in VersionCollection:

elasticsearch/buildSrc/src/main/java/org/elasticsearch/gradle/VersionCollection.java

Line 243 in f8ed6c1

unreleased.add(getLatestVersionByKey(groupByMinor, greatestMinor - 2));

The assumptions about the unreleased versions is incorrect.

elasticmachine · 2019-02-06T13:47:27Z

Pinging @elastic/es-core-infra

alpar-t · 2019-02-06T17:15:21Z

We need to make changes to account for the platform specific changes for bwc builds

This reverts commit 22eeb0c.

alpar-t · 2019-02-07T08:12:07Z

full cluster restart still fails with some seeds:

  2> REPRODUCE WITH: ./gradlew :qa:full-cluster-restart:v7.0.0#oldClusterTestRunner -Dtests.seed=988DCA3188D1E86E -Dtests.class=org.elasticsearch.upgrades.FullClusterRestartIT -Dtests.method="testRecovery" -Dtests.security.manager=true -Dtests.locale=en-FM -Dtests.timezone=Asia/Pontianak -Dcompiler.java=11 -Druntime.java=11
FAILURE 1.16s | FullClusterRestartIT.testRecovery <<< FAILURES!
   > Throwable #1: java.lang.AssertionError: expected:<297> but was:<292>
   >    at __randomizedtesting.SeedInfo.seed([988DCA3188D1E86E:597DB39DA58122C9]:0)
   >    at org.elasticsearch.upgrades.FullClusterRestartIT.assertTotalHits(FullClusterRestartIT.java:667)
   >    at org.elasticsearch.upgrades.FullClusterRestartIT.testRecovery(FullClusterRestartIT.java:777)
   >    at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   >    at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
   >    at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
   >    at java.base/java.lang.reflect.Method.invoke(Method.java:566)
   >    at java.base/java.lang.Thread.run(Thread.java:834)

alpar-t · 2019-02-07T08:25:08Z

@elasticmachine run elasticsearch-ci/default-distro

tvernum

I think this is right, but I have a concern around isRunningAgainstAncientCluster

tvernum · 2019-02-07T10:59:51Z

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

@@ -863,7 +845,7 @@ public void testRecovery() throws Exception {
     */
    public void testSnapshotRestore() throws IOException {
        int count;
-        if (isRunningAgainstOldCluster()) {
+        if (isRunningAgainstOldCluster() && getOldClusterVersion().major < 8) {


Under what circumstances would the old cluster ever be 8.x (or higher) for tests running from the 7.x branch?

It won't for this branch, but as we bump the versions I think we could get there.

tvernum · 2019-02-07T11:05:41Z

test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java

@@ -63,6 +63,10 @@ public final boolean isRunningAgainstOldCluster() {

    private final Version oldClusterVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));

+    public final boolean isRunningAgainstAncientCluster() {
+        return oldClusterVersion.before(Version.V_7_0_0);
+    }


I think this method should check runningAgainstOldCluster (if it's really about which cluster we're running against) or be called something more like isOldClusterAncient (if it's just check the version of the old cluster).

Otherwise the name implies that the behaviour is like isRunningAgainstOldCluster, but it is not.

Oops, good catch @tvernum.

The reason this works most of the time is because most of the invocations to it are already guarded by if (isRunningAgainstOldVersion()).

tvernum · 2019-02-07T11:13:35Z

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

@@ -1132,7 +1121,7 @@ private void checkSnapshot(String snapshotName, int count, Version tookOnVersion

        // In 7.0, type names are no longer returned by default in get index template requests.
        // We therefore use the deprecated typed APIs when running against the current version.
-        if (isRunningAgainstOldCluster() == false) {
+        if (isRunningAgainstAncientCluster() == false) {


Based on the behaviour of isRunningAgainstOldCluster (but see my comment there about the name vs behaviour), this check seems wrong.

If the old cluster is 7.0.0 then isRunningAgainstAncientCluster will be false, and INCLUDE_TYPE_NAME_PARAMETER will be true, but I think we only want that if old version is pre-7 and we're running on the new version.

Similarly if we're testing against 6.7.x the parameter will be added regardless of which cluster we're running against (old or new), which is not how this test worked before.

But maybe I'm confused about why we want this parameter.

Suggested change

if (isRunningAgainstAncientCluster() == false) {

if (isRunningAgainstOldCluster() == false && getOldClusterVersion().major < 7) {

tvernum · 2019-02-07T11:15:08Z

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

        logger.info("Indexing {} random documents", count);
        for (int i = 0; i < count; i++) {
            logger.debug("Indexing document [{}]", i);
-            Request createDocument = new Request("POST", "/" + index + "/doc/" + i);
+            Request createDocument = new Request("POST", "/" + index + "/" + type + "/" + i);
+            if (isRunningAgainstAncientCluster() == false) {


I think is going to get caught by isRunningAgainstAncientCluster not checking which cluster we run on.

I think all invocations (on mobile, so only going from memory from late last night) of this method are run against the old cluster (by a guard higher up the stack). We should fix the method though.

) The clock resolution changed from jdk8 to jdk10, hence the test is passing in jdk8 but failing in jdk10. Scheduled events are serialised and deserialised with millisecond precision, making test fail in jdk 10 and higher. Fixes a problem introduced by elastic#38415 and the fix is identical to the one that was made in elastic#38405.

alpar-t · 2019-02-07T17:46:16Z

@elasticmachine run elasticsearch-ci/1

Tim-Brooks · 2019-02-07T17:49:33Z

This finicky test (#38489) failed on CI/1. I will push an AwaitsFix if more changes need to be made to this PR (based on other failures).

…ch into add-seven-dot-one

This reverts commit e1ceb53.

whether `types` field should be used should be decided later, also it looks like this test was intented to be muted. ('tests.rest.blacklist' system property was in the wrong place)

When we are preparing to release a major version the rules around "unreleased" versions and branches get a bit more complex. This change implements the following rules: - If the tip version on the previous major is a .0 (e.g. 6.7.0) then the tip of the minor before that (e.g. 6.6.1) must be unreleased. (This is because 6.7.0 would be "staged" in preparation for release, but 6.6.1 would be open for bug fixes on the release 6.6.x line) (in VersionCollection & VersionUtils) - The "major.x" branch (if it exists) will always point to the latest minor in that series. Anything that is not the latest minor, must therefore be on a the "major.minor" branch For example, if v7.1.0 exists then the "7.x" branch must be 7.1.0, and 7.0.0 must be on the "7.0" branch (in VersionCollection) - Special logic so that the 7.0.0 build knows that we do not plan to have any 6.x releases after the 6.7 series Backport of: #38593 Partial Backport of: #38513 Co-authored-by: Jason Tedor <[email protected]>

Add 7.1 version constant to 7.x branch

cea8df9

This commit adds the 7.1 version constant to the 7.x branch.

jasontedor assigned alpar-t Feb 6, 2019

jasontedor added >non-issue :Delivery/Build Build or test infrastructure v7.2.0 labels Feb 6, 2019

jasontedor mentioned this pull request Feb 6, 2019

Add 7.1 and 8.0 version constants to master #38514

Merged

Fix incorrect handling of version collections

785aabb

Fix bwcBuilds for versions newer than 7.0.0

8881794

alpar-t mentioned this pull request Feb 6, 2019

Verson bump to 8 on master #38531

Closed

dnhatn and others added 4 commits February 6, 2019 17:46

move old versions to unreleased

09ca07e

Fix imports

d1d136d

Remove bogus assertion

43383de

Use typeless APIs

22eeb0c

jasontedor mentioned this pull request Feb 7, 2019

[DOCS] Updates 7.x Versions.asciidoc #38551

Closed

jasontedor and others added 5 commits February 6, 2019 19:37

Revert "Use typeless APIs"

c168cef

This reverts commit 22eeb0c.

Some full cluster restart tests passing

24a41a2

More fixes

573eb52

Fixes for rolling upgrade

a69e104

Fix full cluster restart tests

f3193c6

alpar-t and others added 2 commits February 7, 2019 11:06

Revert unintentional docker change

f775747

Refresh before getting doc count

68beb68

tvernum reviewed Feb 7, 2019

View reviewed changes

jasontedor and others added 3 commits February 7, 2019 08:05

Fix method

c36e84f

Fix x-pack full cluster restart

01f396c

Completly fix x-pack full cluster restart

56af70b

andrershov mentioned this pull request Feb 7, 2019

Add has_voting_exclusions flag to cluster health output #38568

Closed

alpar-t mentioned this pull request Feb 7, 2019

core.ml.calendars tests failing after version bump #38575

Closed

jkakavas and others added 4 commits February 7, 2019 18:28

Fix watcher tests

df711bd

Fix checkstyle

dde201e

fixed rolling upgrade tests

6097efc

martijnvg and others added 6 commits February 7, 2019 18:53

fixed wrong comparison

62eb470

Mute tests

a717e5e

Merge branch 'add-seven-dot-one' of github.com:jasontedor/elasticsear…

cbdf0dd

…ch into add-seven-dot-one

added pre 7 version and post 7 version of the test

e1ceb53

Revert "added pre 7 version and post 7 version of the test"

d3d9aaf

This reverts commit e1ceb53.

finally fixed rolling upgrade tests, by muteing a test,

5fa7633

whether `types` field should be used should be decided later, also it looks like this test was intented to be muted. ('tests.rest.blacklist' system property was in the wrong place)

jasontedor merged commit fdf6b3f into elastic:7.x Feb 7, 2019

jasontedor deleted the add-seven-dot-one branch February 7, 2019 21:32

tvernum mentioned this pull request Feb 8, 2019

Fix version logic when bumping major version #38595

Merged

droberts195 mentioned this pull request Feb 8, 2019

Fix the clock resolution to millis in ScheduledEventTests #38516

Closed

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add 7.1 version constant to 7.x branch #38513

Add 7.1 version constant to 7.x branch #38513

jasontedor commented Feb 6, 2019

jasontedor commented Feb 6, 2019

elasticmachine commented Feb 6, 2019

alpar-t commented Feb 6, 2019

alpar-t commented Feb 7, 2019

alpar-t commented Feb 7, 2019

tvernum left a comment

tvernum Feb 7, 2019

alpar-t Feb 7, 2019

tvernum Feb 7, 2019

jasontedor Feb 7, 2019

jasontedor Feb 7, 2019

tvernum Feb 7, 2019

tvernum Feb 7, 2019

jasontedor Feb 7, 2019

alpar-t commented Feb 7, 2019

Tim-Brooks commented Feb 7, 2019

	if (isRunningAgainstAncientCluster() == false) {
	if (isRunningAgainstOldCluster() == false && getOldClusterVersion().major < 7) {

Add 7.1 version constant to 7.x branch #38513

Add 7.1 version constant to 7.x branch #38513

Conversation

jasontedor commented Feb 6, 2019

jasontedor commented Feb 6, 2019

elasticmachine commented Feb 6, 2019

alpar-t commented Feb 6, 2019

alpar-t commented Feb 7, 2019

alpar-t commented Feb 7, 2019

tvernum left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpar-t commented Feb 7, 2019

Tim-Brooks commented Feb 7, 2019