Update version to 7.0.0-alpha1 (#25876)

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.

Closes #25893
Closes #25870

build.gradle

@@ -79,18 +79,20 @@ int lastPrevMinor = -1 // the minor version number from the prev major we most r
 for (String line : versionLines) {
   /* Note that this skips alphas and betas which is fine because they aren't
    * compatible with anything. */
-  Matcher match = line =~ /\W+public static final Version V_(\d+)_(\d+)_(\d+) .*/
+  Matcher match = line =~ /\W+public static final Version V_(\d+)_(\d+)_(\d+)(_beta\d+|_rc\d+)? .*/
   if (match.matches()) {
     int major = Integer.parseInt(match.group(1))
     int minor = Integer.parseInt(match.group(2))
     int bugfix = Integer.parseInt(match.group(3))
     Version foundVersion = new Version(major, minor, bugfix, false)
-    if (currentVersion != foundVersion) {
+    if (currentVersion != foundVersion
+        && (major == prevMajor || major == currentVersion.major)
+        && (versions.isEmpty() || versions.last() != foundVersion)) {
       versions.add(foundVersion)
-    }
-    if (major == prevMajor && minor > lastPrevMinor) {
-      prevMinorIndex = versions.size() - 1
-      lastPrevMinor = minor
+      if (major == prevMajor && minor > lastPrevMinor) {
+        prevMinorIndex = versions.size() - 1
+        lastPrevMinor = minor
+      }
     }
   }
 }
@@ -242,9 +244,11 @@ subprojects {
       ext.projectSubstitutions["org.elasticsearch.distribution.deb:elasticsearch:${indexCompatVersions[-1]}"] = ':distribution:bwc-stable-snapshot'
       ext.projectSubstitutions["org.elasticsearch.distribution.rpm:elasticsearch:${indexCompatVersions[-1]}"] = ':distribution:bwc-stable-snapshot'
       ext.projectSubstitutions["org.elasticsearch.distribution.zip:elasticsearch:${indexCompatVersions[-1]}"] = ':distribution:bwc-stable-snapshot'
-      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) {
+        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'
+      }
     } else {
       ext.projectSubstitutions["org.elasticsearch.distribution.deb:elasticsearch:${indexCompatVersions[-1]}"] = ':distribution:bwc-release-snapshot'
       ext.projectSubstitutions["org.elasticsearch.distribution.rpm:elasticsearch:${indexCompatVersions[-1]}"] = ':distribution:bwc-release-snapshot'

buildSrc/version.properties

@@ -1,5 +1,5 @@
 # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
-elasticsearch     = 6.0.0-beta1
+elasticsearch     = 7.0.0-alpha1
 lucene            = 7.0.0-snapshot-00142c9
 
 # optional dependencies

core/src/main/java/org/elasticsearch/Version.java

@@ -99,7 +99,13 @@ public class Version implements Comparable<Version> {
     public static final int V_6_0_0_beta1_ID = 6000026;
     public static final Version V_6_0_0_beta1 =
         new Version(V_6_0_0_beta1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
-    public static final Version CURRENT = V_6_0_0_beta1;
+    public static final int V_6_1_0_ID = 6010099;
+    public static final Version V_6_1_0 =
+        new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
+    public static final int V_7_0_0_alpha1_ID = 7000001;
+    public static final Version V_7_0_0_alpha1 =
+        new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
+    public static final Version CURRENT = V_7_0_0_alpha1;
 
     // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT)
 
@@ -114,6 +120,10 @@ public static Version readVersion(StreamInput in) throws IOException {
 
     public static Version fromId(int id) {
         switch (id) {
+            case V_7_0_0_alpha1_ID:
+                return V_7_0_0_alpha1;
+            case V_6_1_0_ID:
+                return V_6_1_0;
             case V_6_0_0_beta1_ID:
                 return V_6_0_0_beta1;
             case V_6_0_0_alpha2_ID:
@@ -311,12 +321,12 @@ public int compareTo(Version other) {
     public Version minimumCompatibilityVersion() {
         final int bwcMajor;
         final int bwcMinor;
+        // TODO: remove this entirely, making it static for each version
         if (major == 6) { // we only specialize for current major here
             bwcMajor = Version.V_5_6_0.major;
             bwcMinor = Version.V_5_6_0.minor;
-        } else if (major > 6) { // all the future versions are compatible with first minor...
-            bwcMajor = major -1;
-            bwcMinor = 0;
+        } else if (major == 7) { // we only specialize for current major here
+            return V_6_1_0;
         } else {
             bwcMajor = major;
             bwcMinor = 0;
@@ -333,6 +343,8 @@ public Version minimumIndexCompatibilityVersion() {
         final int bwcMajor;
         if (major == 5) {
             bwcMajor = 2; // we jumped from 2 to 5
+        } else if (major == 7) {
+            return V_6_0_0_beta1;
         } else {
             bwcMajor = major - 1;
         }

core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java

@@ -415,8 +415,7 @@ public SnapshotsInProgress(StreamInput in) throws IOException {
             int shards = in.readVInt();
             for (int j = 0; j < shards; j++) {
                 ShardId shardId = ShardId.readShardId(in);
-                // TODO: Change this to an appropriate version when it's backported
-                if (in.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
+                if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
                     builder.put(shardId, new ShardSnapshotStatus(in));
                 } else {
                     String nodeId = in.readOptionalString();
@@ -459,8 +458,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeVInt(entry.shards().size());
             for (ObjectObjectCursor<ShardId, ShardSnapshotStatus> shardEntry : entry.shards()) {
                 shardEntry.key.writeTo(out);
-                // TODO: Change this to an appropriate version when it's backported
-                if (out.getVersion().onOrAfter(Version.V_6_0_0_beta1)) {
+                if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
                     shardEntry.value.writeTo(out);
                 } else {
                     out.writeOptionalString(shardEntry.value.nodeId());

core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java

@@ -141,7 +141,7 @@ private void checkMappingsCompatibility(IndexMetaData indexMetaData) {
             // been started yet. However, we don't really need real analyzers at this stage - so we can fake it
             IndexSettings indexSettings = new IndexSettings(indexMetaData, this.settings);
             SimilarityService similarityService = new SimilarityService(indexSettings, Collections.emptyMap());
-            final NamedAnalyzer fakeDefault = new NamedAnalyzer("fake_default", AnalyzerScope.INDEX, new Analyzer() {
+            final NamedAnalyzer fakeDefault = new NamedAnalyzer("default", AnalyzerScope.INDEX, new Analyzer() {
                 @Override
                 protected TokenStreamComponents createComponents(String fieldName) {
                     throw new UnsupportedOperationException("shouldn't be here");

core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java

@@ -221,14 +221,7 @@ public DiscoveryNode(StreamInput in) throws IOException {
         this.ephemeralId = in.readString().intern();
         this.hostName = in.readString().intern();
         this.hostAddress = in.readString().intern();
-        if (in.getVersion().after(Version.V_5_0_2)) {
-            this.address = new TransportAddress(in);
-        } else {
-            // we need to do this to preserve the host information during pinging and joining of a master. Since the version of the
-            // DiscoveryNode is set to Version#minimumCompatibilityVersion(), the host information gets lost as we do not serialize the
-            // hostString for the address
-            this.address = new TransportAddress(in, hostName);
-        }
+        this.address = new TransportAddress(in);
         int size = in.readVInt();
         this.attributes = new HashMap<>(size);
         for (int i = 0; i < size; i++) {

core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java

@@ -19,8 +19,6 @@
 
 package org.elasticsearch.common.transport;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
@@ -70,46 +68,21 @@ public TransportAddress(InetSocketAddress address) {
      * Read from a stream.
      */
     public TransportAddress(StreamInput in) throws IOException {
-        this(in, null);
-    }
-
-    /**
-     * Read from a stream and use the {@code hostString} when creating the InetAddress if the input comes from a version on or prior
-     * {@link Version#V_5_0_2} as the hostString was not serialized
-     */
-    public TransportAddress(StreamInput in, @Nullable String hostString) throws IOException {
-        if (in.getVersion().before(Version.V_6_0_0_alpha1)) { // bwc layer for 5.x where we had more than one transport address
-            final short i = in.readShort();
-            if(i != 1) { // we fail hard to ensure nobody tries to use some custom transport address impl even if that is difficult to add
-                throw new AssertionError("illegal transport ID from node of version: " + in.getVersion()  + " got: " + i + " expected: 1");
-            }
-        }
         final int len = in.readByte();
         final byte[] a = new byte[len]; // 4 bytes (IPv4) or 16 bytes (IPv6)
         in.readFully(a);
-        final InetAddress inetAddress;
-        if (in.getVersion().after(Version.V_5_0_2)) {
-            String host = in.readString(); // the host string was serialized so we can ignore the passed in version
-            inetAddress = InetAddress.getByAddress(host, a);
-        } else {
-            // prior to this version, we did not serialize the host string so we used the passed in version
-            inetAddress = InetAddress.getByAddress(hostString, a);
-        }
+        String host = in.readString(); // the host string was serialized so we can ignore the passed in version
+        final InetAddress inetAddress = InetAddress.getByAddress(host, a);
         int port = in.readInt();
         this.address = new InetSocketAddress(inetAddress, port);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        if (out.getVersion().before(Version.V_6_0_0_alpha1)) {
-            out.writeShort((short)1); // this maps to InetSocketTransportAddress in 5.x
-        }
         byte[] bytes = address.getAddress().getAddress();  // 4 bytes (IPv4) or 16 bytes (IPv6)
         out.writeByte((byte) bytes.length); // 1 byte
         out.write(bytes, 0, bytes.length);
-        if (out.getVersion().after(Version.V_5_0_2)) {
-            out.writeString(address.getHostString());
-        }
+        out.writeString(address.getHostString());
         // don't serialize scope ids over the network!!!!
         // these only make sense with respect to the local machine, and will only formulate
         // the address incorrectly remotely.

core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java

@@ -496,14 +496,8 @@ public IndexAnalyzers build(IndexSettings indexSettings,
             throw new IllegalArgumentException("no default analyzer configured");
         }
         if (analyzers.containsKey("default_index")) {
-            final Version createdVersion = indexSettings.getIndexVersionCreated();
-            if (createdVersion.onOrAfter(Version.V_5_0_0_alpha1)) {
-                throw new IllegalArgumentException("setting [index.analysis.analyzer.default_index] is not supported anymore, use [index.analysis.analyzer.default] instead for index [" + index.getName() + "]");
-            } else {
-                deprecationLogger.deprecated("setting [index.analysis.analyzer.default_index] is deprecated, use [index.analysis.analyzer.default] instead for index [{}]", index.getName());
-            }
+            throw new IllegalArgumentException("setting [index.analysis.analyzer.default_index] is not supported anymore, use [index.analysis.analyzer.default] instead for index [" + index.getName() + "]");
         }
-        NamedAnalyzer defaultIndexAnalyzer = analyzers.containsKey("default_index") ? analyzers.get("default_index") : defaultAnalyzer;
         NamedAnalyzer defaultSearchAnalyzer = analyzers.containsKey("default_search") ? analyzers.get("default_search") : defaultAnalyzer;
         NamedAnalyzer defaultSearchQuoteAnalyzer = analyzers.containsKey("default_search_quote") ? analyzers.get("default_search_quote") : defaultSearchAnalyzer;
 
@@ -512,7 +506,7 @@ public IndexAnalyzers build(IndexSettings indexSettings,
                 throw new IllegalArgumentException("analyzer name must not start with '_'. got \"" + analyzer.getKey() + "\"");
             }
         }
-        return new IndexAnalyzers(indexSettings, defaultIndexAnalyzer, defaultSearchAnalyzer, defaultSearchQuoteAnalyzer,
+        return new IndexAnalyzers(indexSettings, defaultAnalyzer, defaultSearchAnalyzer, defaultSearchQuoteAnalyzer,
             unmodifiableMap(analyzers), unmodifiableMap(normalizers));
     }
 

core/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java

@@ -46,6 +46,9 @@ public IndexAnalyzers(IndexSettings indexSettings, NamedAnalyzer defaultIndexAna
                           NamedAnalyzer defaultSearchQuoteAnalyzer, Map<String, NamedAnalyzer> analyzers,
                           Map<String, NamedAnalyzer> normalizers) {
         super(indexSettings);
+        if (defaultIndexAnalyzer.name().equals("default") == false) {
+            throw new IllegalStateException("default analyzer must have the name [default] but was: [" + defaultIndexAnalyzer.name() + "]");
+        }
         this.defaultIndexAnalyzer = defaultIndexAnalyzer;
         this.defaultSearchAnalyzer = defaultSearchAnalyzer;
         this.defaultSearchQuoteAnalyzer = defaultSearchQuoteAnalyzer;

core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy

@@ -63,7 +63,7 @@ grant codeBase "${codebase.mocksocket-1.2.jar}" {
   permission java.net.SocketPermission "*", "accept,connect";
 };
 
-grant codeBase "${codebase.elasticsearch-rest-client-6.0.0-beta1-SNAPSHOT.jar}" {
+grant codeBase "${codebase.elasticsearch-rest-client-7.0.0-alpha1-SNAPSHOT.jar}" {
   // rest makes socket connections for rest tests
   permission java.net.SocketPermission "*", "connect";
   // rest client uses system properties which gets the default proxy
@@ -72,7 +72,7 @@ grant codeBase "${codebase.elasticsearch-rest-client-6.0.0-beta1-SNAPSHOT.jar}"
 
 // IDEs need this because they do not play nicely with removing artifacts on projects,
 // so we keep it in here for IDE test support
-grant codeBase "${codebase.elasticsearch-rest-client-6.0.0-beta1-SNAPSHOT-deps.jar}" {
+grant codeBase "${codebase.elasticsearch-rest-client-7.0.0-alpha1-SNAPSHOT-deps.jar}" {
   // rest makes socket connections for rest tests
   permission java.net.SocketPermission "*", "connect";
 };

core/src/test/java/org/elasticsearch/VersionTests.java

@@ -337,12 +337,8 @@ public void testIsCompatible() {
         assertTrue(isCompatible(Version.V_5_6_0, Version.V_6_0_0_alpha2));
         assertFalse(isCompatible(Version.fromId(2000099), Version.V_6_0_0_alpha2));
         assertFalse(isCompatible(Version.fromId(2000099), Version.V_5_0_0));
-        assertTrue(isCompatible(Version.fromString("6.0.0"), Version.fromString("7.0.0")));
-        if (Version.CURRENT.isRelease()) {
-            assertTrue(isCompatible(Version.CURRENT, Version.fromString("7.0.0")));
-        } else {
-            assertFalse(isCompatible(Version.CURRENT, Version.fromString("7.0.0")));
-        }
+        assertTrue(isCompatible(Version.fromString("6.1.0"), Version.fromString("7.0.0")));
+        assertFalse(isCompatible(Version.fromString("6.0.0-alpha1"), Version.fromString("7.0.0")));
         assertFalse("only compatible with the latest minor",
             isCompatible(VersionUtils.getPreviousMinorVersion(), Version.fromString("7.0.0")));
         assertFalse(isCompatible(Version.V_5_0_0, Version.fromString("6.0.0")));

core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java

@@ -91,16 +91,18 @@ public void testFailUpgrade() {
             .put(IndexMetaData.SETTING_VERSION_UPGRADED, Version.V_5_0_0_beta1)
             .put(IndexMetaData.SETTING_VERSION_CREATED, Version.fromString("2.4.0"))
             .build());
+        // norelease : having a hardcoded version message requires modifying this test when creating new major version. fix this...
         String message = expectThrows(IllegalStateException.class, () -> service.upgradeIndexMetaData(metaData,
             Version.CURRENT.minimumIndexCompatibilityVersion())).getMessage();
-        assertEquals(message, "The index [[foo/BOOM]] was created with version [2.4.0] but the minimum compatible version is [5.0.0]." +
-            " It should be re-indexed in Elasticsearch 5.x before upgrading to " + Version.CURRENT.toString() + ".");
+        assertEquals(message, "The index [[foo/BOOM]] was created with version [2.4.0] " +
+             "but the minimum compatible version is [6.0.0-beta1]." +
+            " It should be re-indexed in Elasticsearch 6.x before upgrading to " + Version.CURRENT.toString() + ".");
 
         IndexMetaData goodMeta = newIndexMeta("foo", Settings.builder()
             .put(IndexMetaData.SETTING_VERSION_UPGRADED, Version.V_5_0_0_beta1)
             .put(IndexMetaData.SETTING_VERSION_CREATED, Version.fromString("5.1.0"))
             .build());
-        service.upgradeIndexMetaData(goodMeta, Version.V_5_0_0.minimumIndexCompatibilityVersion());
+        service.upgradeIndexMetaData(goodMeta, Version.V_6_0_0_beta1.minimumIndexCompatibilityVersion());
     }
 
     public void testPluginUpgrade() {

core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java

@@ -58,28 +58,4 @@ public void testDiscoveryNodeSerializationKeepsHost() throws Exception {
         assertEquals(transportAddress.getAddress(), serialized.getAddress().getAddress());
         assertEquals(transportAddress.getPort(), serialized.getAddress().getPort());
     }
-
-    public void testDiscoveryNodeSerializationToOldVersion() throws Exception {
-        InetAddress inetAddress = InetAddress.getByAddress("name1", new byte[] { (byte) 192, (byte) 168, (byte) 0, (byte) 1});
-        TransportAddress transportAddress = new TransportAddress(inetAddress, randomIntBetween(0, 65535));
-        DiscoveryNode node = new DiscoveryNode("name1", "id1", transportAddress, emptyMap(), emptySet(), Version.CURRENT);
-
-        BytesStreamOutput streamOutput = new BytesStreamOutput();
-        streamOutput.setVersion(Version.V_5_0_0);
-        node.writeTo(streamOutput);
-
-        StreamInput in = StreamInput.wrap(streamOutput.bytes().toBytesRef().bytes);
-        in.setVersion(Version.V_5_0_0);
-        DiscoveryNode serialized = new DiscoveryNode(in);
-        assertEquals(transportAddress.address().getHostString(), serialized.getHostName());
-        assertEquals(transportAddress.address().getHostString(), serialized.getAddress().address().getHostString());
-        assertEquals(transportAddress.getAddress(), serialized.getHostAddress());
-        assertEquals(transportAddress.getAddress(), serialized.getAddress().getAddress());
-        assertEquals(transportAddress.getPort(), serialized.getAddress().getPort());
-        assertFalse("if the minimum index compatibility version moves past 5.0.3, remove the special casing in DiscoverNode(StreamInput)" +
-                " and the TransportAddress(StreamInput, String) constructor",
-            Version.CURRENT.minimumIndexCompatibilityVersion().after(Version.V_5_0_2));
-        // serialization can happen from an old cluster-state in a full cluster restart
-        // hence we need to maintain this until we drop index bwc
-    }
 }