Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/internal/Versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ This is an optional cleanup step that is never required for correctness.
The transport version used between two nodes is determined by the initial handshake
(see `TransportHandshaker`, where the two nodes swap their highest known transport version).
The lowest transport version that is compatible with the current node
is determined by `TransportVersions.MINIMUM_COMPATIBLE`,
is determined by `TransportVersion.minimumCompatible()`,
and the node is prevented from joining the cluster if it is below that version.
This constant should be updated manually on a major release.

The minimum version that can be used for CCS is determined by
`TransportVersions.MINIMUM_CCS_VERSION`, but this is not actively checked
`TransportVersion.minimumCCSVersion()`, but this is not actively checked
before queries are performed. Only if a query cannot be serialized at that
version is an action rejected. This constant is updated automatically
as part of performing a release.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.apache.lucene.search.IndexSearcher;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.aggregations.bucket.adjacency.AdjacencyMatrixAggregator.KeyedFilter;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -256,6 +255,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.aggregations.bucket.histogram;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.Rounding;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -255,7 +254,7 @@ public boolean equals(Object obj) {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}

public static class RoundingInfo implements Writeable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.aggregations.pipeline;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -217,6 +216,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
package org.elasticsearch.aggregations.pipeline;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder;
Expand Down Expand Up @@ -196,6 +195,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.aggregations.pipeline;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Rounding;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down Expand Up @@ -259,6 +258,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.aggregations.pipeline;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -223,6 +222,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.ingest.geoip;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.persistent.PersistentTaskParams;
Expand Down Expand Up @@ -44,7 +43,7 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.elasticsearch.script.mustache;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -210,7 +210,7 @@ public void testCCSCheckCompatibility() throws Exception {
"[fail_before_current_version] was released first in version %s, failed compatibility "
+ "check trying to send it to node with version %s",
FailBeforeCurrentVersionQueryBuilder.FUTURE_VERSION.toReleaseVersion(),
TransportVersions.MINIMUM_CCS_VERSION.toReleaseVersion()
TransportVersion.minimumCCSVersion().toReleaseVersion()
);
String actualCause = ex.getCause().getMessage();
assertEquals(expectedCause, actualCause);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ public void testIndexedTemplateWithArray() {

/**
* Test that triggering the CCS compatibility check with a query that shouldn't go to the minor before
* TransportVersions.MINIMUM_CCS_VERSION works
* TransportVersion.minimumCCSVersion() works
*/
public void testCCSCheckCompatibility() throws Exception {
String templateString = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.index.mapper.MappedFieldType;
Expand Down Expand Up @@ -416,6 +415,6 @@ protected int doHashCode() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.apache.lucene.search.Query;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -177,6 +176,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.apache.lucene.search.Query;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -181,6 +180,6 @@ public String getType() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.lucene.search.similarities.Similarity;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -543,6 +542,6 @@ protected void extractInnerHitBuilders(Map<String, InnerHitContextBuilder> inner

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.apache.lucene.search.join.ScoreMode;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -315,6 +314,6 @@ protected void extractInnerHitBuilders(Map<String, InnerHitContextBuilder> inner

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.apache.lucene.search.TermQuery;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -195,6 +194,6 @@ public String getWriteableName() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,6 @@ public void addNamedQuery(String name, Query query) {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesArray;
Expand Down Expand Up @@ -1212,7 +1211,7 @@ protected boolean doEquals(CustomParserQueryBuilder other) {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.apache.lucene.util.Constants;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
Expand Down Expand Up @@ -80,7 +79,7 @@ public void executeHandshake(
super.executeHandshake(node, channel, profile, listener);
} else {
assert version.equals(TransportVersion.current());
listener.onResponse(TransportVersions.MINIMUM_COMPATIBLE);
listener.onResponse(TransportVersion.minimumCompatible());
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ public SuggestionSearchContext.SuggestionContext build(SearchExecutionContext co

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,6 @@ public Explanation explain(int topLevelDocId, IndexSearcher searcher, RescoreCon

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.carrotsearch.randomizedtesting.annotations.Name;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.Version;
import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
Expand Down Expand Up @@ -254,7 +253,7 @@ public void testQueryBuilderBWC() throws Exception {
TransportVersion transportVersion;
if (originalClusterHasTransportVersion == false) {
transportVersion = TransportVersion.fromId(
parseLegacyVersion(getOldClusterVersion()).map(Version::id).orElse(TransportVersions.MINIMUM_COMPATIBLE.id())
parseLegacyVersion(getOldClusterVersion()).map(Version::id).orElse(TransportVersion.minimumCompatible().id())
);
} else {
transportVersion = TransportVersion.readVersion(input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.ScoreMode;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
Expand Down Expand Up @@ -648,7 +647,7 @@ public long bytesToPreallocate() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import org.apache.lucene.search.Explanation;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchType;
Expand Down Expand Up @@ -137,7 +136,7 @@ public DecayFunction getDecayFunction() {

@Override
public TransportVersion getMinimalSupportedVersion() {
return TransportVersions.ZERO;
return TransportVersion.zero();
}

private static final DecayFunction decayFunction = new LinearMultScoreFunction();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.search.msearch;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.search.MultiSearchRequest;
import org.elasticsearch.action.search.MultiSearchResponse.Item;
import org.elasticsearch.common.settings.Settings;
Expand Down Expand Up @@ -90,10 +89,10 @@ public void testSimpleMultiSearchMoreRequests() throws Exception {

/**
* Test that triggering the CCS compatibility check with a query that shouldn't go to the minor before
* TransportVersions.MINIMUM_CCS_VERSION works
* TransportVersion.minimumCCSVersion() works
*/
public void testCCSCheckCompatibility() throws Exception {
TransportVersion transportVersion = TransportVersionUtils.getNextVersion(TransportVersions.MINIMUM_CCS_VERSION, true);
TransportVersion transportVersion = TransportVersionUtils.getNextVersion(TransportVersion.minimumCCSVersion(), true);
createIndex("test");
ensureGreen();
prepareIndex("test").setId("1").setSource("field", "xxx").get();
Expand Down
Loading
Loading