honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BWC] Ensure 2.x compatibility with Legacy 7.10.x (#1902) 

* [BWC] Ensure 2.x compatibility with Legacy 7.10.x

This commit fixes TransportHandshaker to send a spoofed Legacy 7.10.2 mincompat
version to ensure OpenSearch 2.x nodes can join a Legacy 7.10.x cluster for
rolling upgrade support. Without this change 7.10.x and OpenSearch 2.x mixed
cluster bwc tests would fail.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

* fix AbstractSimpleTransportTestCase failures

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

* change v3 to local static

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

* make V_3_0_0 package private and reuse in test

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
This commit is contained in:
Nick Knize 2022-01-17 11:26:28 -06:00 committed by GitHub
parent dd8ad29770
commit 81d998dd7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/opensearch/transport/TransportHandshaker.java
View File

@ -63,6 +63,9 @@ final class TransportHandshaker {
private final ThreadPool threadPool; private final ThreadPool threadPool;
private final HandshakeRequestSender handshakeRequestSender; private final HandshakeRequestSender handshakeRequestSender;
// @todo remove in 3.0.0
static final Version V_3_0_0 = Version.fromId(3000099 ^ Version.MASK);
TransportHandshaker(Version version, ThreadPool threadPool, HandshakeRequestSender handshakeRequestSender) { TransportHandshaker(Version version, ThreadPool threadPool, HandshakeRequestSender handshakeRequestSender) {
this.version = version; this.version = version;
this.threadPool = threadPool; this.threadPool = threadPool;
@ -131,8 +134,9 @@ final class TransportHandshaker {
// 1. if remote node is 7.x, then StreamInput version would be 6.8.0 // 1. if remote node is 7.x, then StreamInput version would be 6.8.0
// 2. if remote node is 6.8 then it would be 5.6.0 // 2. if remote node is 6.8 then it would be 5.6.0
// 3. if remote node is OpenSearch 1.x then it would be 6.7.99 // 3. if remote node is OpenSearch 1.x then it would be 6.7.99
if ((this.version.onOrAfter(Version.V_1_0_0) && this.version.before(Version.V_2_0_0)) if ((this.version.onOrAfter(Version.V_1_0_0) && this.version.before(V_3_0_0))
&& (stream.getVersion().equals(LegacyESVersion.fromId(6080099)) || stream.getVersion().equals(Version.fromId(5060099)))) { && (stream.getVersion().equals(LegacyESVersion.fromId(6080099)) || stream.getVersion().equals(Version.fromId(5060099)))) {
// send 7.10.2 in response to ensure compatibility w/ Legacy 7.10.x nodes for rolling upgrade support
channel.sendResponse(new HandshakeResponse(LegacyESVersion.V_7_10_2)); channel.sendResponse(new HandshakeResponse(LegacyESVersion.V_7_10_2));
} else { } else {
channel.sendResponse(new HandshakeResponse(this.version)); channel.sendResponse(new HandshakeResponse(this.version));

9
test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
View File

@ -107,6 +107,7 @@ import java.util.stream.Collectors;
import static java.util.Collections.emptyMap; import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet; import static java.util.Collections.emptySet;
import static org.opensearch.transport.TransportHandshaker.V_3_0_0;
import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR; import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.empty;
@ -2226,10 +2227,10 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase
TransportRequestOptions.Type.STATE TransportRequestOptions.Type.STATE
); );
try (Transport.Connection connection = serviceA.openConnection(node, builder.build())) { try (Transport.Connection connection = serviceA.openConnection(node, builder.build())) {
// OpenSearch [1.0:2.0) in bwc mode should only "upgrade" to Legacy v7.10.2 // OpenSearch [1.0:3.0) in bwc mode should only "upgrade" to Legacy v7.10.2
assertEquals( assertEquals(
connection.getVersion(), connection.getVersion(),
version.onOrAfter(Version.V_1_0_0) && version.before(Version.V_2_0_0) ? LegacyESVersion.V_7_10_2 : version version.onOrAfter(Version.V_1_0_0) && version.before(V_3_0_0) ? LegacyESVersion.V_7_10_2 : version
); );
} }
} }
@ -2275,7 +2276,9 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase
PlainActionFuture<Transport.Connection> future = PlainActionFuture.newFuture(); PlainActionFuture<Transport.Connection> future = PlainActionFuture.newFuture();
serviceA.getOriginalTransport().openConnection(node, connectionProfile, future); serviceA.getOriginalTransport().openConnection(node, connectionProfile, future);
try (Transport.Connection connection = future.actionGet()) { try (Transport.Connection connection = future.actionGet()) {
assertEquals(Version.V_2_0_0, connection.getVersion()); // OpenSearch sends a handshake version spoofed as Legacy version 7_10_2
// todo change for OpenSearch 3.0.0 when Legacy compatibility is removed
assertEquals(LegacyESVersion.V_7_10_2, connection.getVersion());
} }
} }
} }