Skip to content

Add 6.6.0 version to master #34847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlrx merged 2 commits into from
Oct 25, 2018
Merged

Add 6.6.0 version to master #34847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8421365
Add 6.6.0 version to master
tlrx Oct 25, 2018
0b1591e
Adapt TcpTransportTests
tlrx Oct 25, 2018
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: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_6_4_3 = new Version(V_6_4_3_ID, org.apache.lucene.util.Version.LUCENE_7_4_0);
public static final int V_6_5_0_ID = 6050099;
public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0);
public static final int V_6_6_0_ID = 6060099;
public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_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_8_0_0);
Expand All @@ -125,6 +127,8 @@ public static Version fromId(int id) {
switch (id) {
case V_7_0_0_alpha1_ID:
return V_7_0_0_alpha1;
case V_6_6_0_ID:
return V_6_6_0;
case V_6_5_0_ID:
return V_6_5_0;
case V_6_4_3_ID:
Expand Down
5 changes: 3 additions & 2 deletions server/src/test/java/org/elasticsearch/VersionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public void testMinCompatVersion() {

// from 7.0 on we are supporting the latest minor of the previous major... this might fail once we add a new version ie. 5.x is
// released since we need to bump the supported minor in Version#minimumCompatibilityVersion()
Version lastVersion = Version.V_6_5_0; // TODO: remove this once min compat version is a constant instead of method
Version lastVersion = Version.V_6_6_0; // TODO: remove this once min compat version is a constant instead of method
assertEquals(lastVersion.major, Version.V_7_0_0_alpha1.minimumCompatibilityVersion().major);
assertEquals("did you miss to bump the minor in Version#minimumCompatibilityVersion()",
lastVersion.minor, Version.V_7_0_0_alpha1.minimumCompatibilityVersion().minor);
Expand Down Expand Up @@ -340,7 +340,8 @@ public static void assertUnknownVersion(Version version) {

public void testIsCompatible() {
assertTrue(isCompatible(Version.CURRENT, Version.CURRENT.minimumCompatibilityVersion()));
assertTrue(isCompatible(Version.V_6_5_0, Version.V_7_0_0_alpha1));
assertFalse(isCompatible(Version.V_6_5_0, Version.V_7_0_0_alpha1));
assertTrue(isCompatible(Version.V_6_6_0, Version.V_7_0_0_alpha1));
assertFalse(isCompatible(Version.fromId(2000099), Version.V_7_0_0_alpha1));
assertFalse(isCompatible(Version.fromId(2000099), Version.V_6_5_0));
assertFalse(isCompatible(Version.fromString("7.0.0"), Version.fromString("8.0.0")));
Expand Down
28 changes: 15 additions & 13 deletions server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,27 +156,29 @@ public void testEnsureVersionCompatibility() {
TcpTransport.ensureVersionCompatibility(VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumCompatibilityVersion(),
Version.CURRENT), Version.CURRENT, randomBoolean());

TcpTransport.ensureVersionCompatibility(Version.fromString("6.0.0"), Version.fromString("7.0.0"), true);
final Version version = Version.fromString("7.0.0");
TcpTransport.ensureVersionCompatibility(Version.fromString("6.0.0"), version, true);
IllegalStateException ise = expectThrows(IllegalStateException.class, () ->
TcpTransport.ensureVersionCompatibility(Version.fromString("6.0.0"), Version.fromString("7.0.0"), false));
assertEquals("Received message from unsupported version: [6.0.0] minimal compatible version is: [6.5.0]", ise.getMessage());
TcpTransport.ensureVersionCompatibility(Version.fromString("6.0.0"), version, false));
assertEquals("Received message from unsupported version: [6.0.0] minimal compatible version is: ["
+ version.minimumCompatibilityVersion() + "]", ise.getMessage());

// For handshake we are compatible with N-2
TcpTransport.ensureVersionCompatibility(Version.fromString("5.6.0"), Version.fromString("7.0.0"), true);
TcpTransport.ensureVersionCompatibility(Version.fromString("5.6.0"), version, true);
ise = expectThrows(IllegalStateException.class, () ->
TcpTransport.ensureVersionCompatibility(Version.fromString("5.6.0"), Version.fromString("7.0.0"), false));
assertEquals("Received message from unsupported version: [5.6.0] minimal compatible version is: [6.5.0]",
ise.getMessage());
TcpTransport.ensureVersionCompatibility(Version.fromString("5.6.0"), version, false));
assertEquals("Received message from unsupported version: [5.6.0] minimal compatible version is: ["
+ version.minimumCompatibilityVersion() + "]", ise.getMessage());

ise = expectThrows(IllegalStateException.class, () ->
TcpTransport.ensureVersionCompatibility(Version.fromString("2.3.0"), Version.fromString("7.0.0"), true));
assertEquals("Received handshake message from unsupported version: [2.3.0] minimal compatible version is: [6.5.0]",
ise.getMessage());
TcpTransport.ensureVersionCompatibility(Version.fromString("2.3.0"), version, true));
assertEquals("Received handshake message from unsupported version: [2.3.0] minimal compatible version is: ["
+ version.minimumCompatibilityVersion() + "]", ise.getMessage());

ise = expectThrows(IllegalStateException.class, () ->
TcpTransport.ensureVersionCompatibility(Version.fromString("2.3.0"), Version.fromString("7.0.0"), false));
assertEquals("Received message from unsupported version: [2.3.0] minimal compatible version is: [6.5.0]",
ise.getMessage());
TcpTransport.ensureVersionCompatibility(Version.fromString("2.3.0"), version, false));
assertEquals("Received message from unsupported version: [2.3.0] minimal compatible version is: ["
+ version.minimumCompatibilityVersion() + "]", ise.getMessage());
}

public void testCompressRequest() throws IOException {
Expand Down