Skip to content

Commit 6de1db8

Browse files
authored
Re-enable BWC tests after backport of #53338 (#53389)
1 parent 12613fa commit 6de1db8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ task verifyVersions {
220220
* after the backport of the backcompat code is complete.
221221
*/
222222

223-
boolean bwc_tests_enabled = false
224-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/53338" /* place a PR link here when committing bwc changes */
223+
boolean bwc_tests_enabled = true
224+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
225225
if (bwc_tests_enabled == false) {
226226
if (bwc_tests_disabled_issue.isEmpty()) {
227227
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/cluster/coordination/JoinRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class JoinRequest extends TransportRequest {
3838
/**
3939
* The minimum term for which the joining node will accept any cluster state publications. If the joining node is in a strictly greater
4040
* term than the master it wants to join then the master must enter a new term and hold another election. Doesn't necessarily match
41-
* {@link JoinRequest#optionalJoin} and may be zero in join requests sent prior to {@link Version#V_8_0_0}.
41+
* {@link JoinRequest#optionalJoin}.
4242
*/
4343
private final long minimumTerm;
4444

@@ -60,7 +60,7 @@ public JoinRequest(DiscoveryNode sourceNode, long minimumTerm, Optional<Join> op
6060
public JoinRequest(StreamInput in) throws IOException {
6161
super(in);
6262
sourceNode = new DiscoveryNode(in);
63-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
63+
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
6464
minimumTerm = in.readLong();
6565
} else {
6666
minimumTerm = 0L;
@@ -72,7 +72,7 @@ public JoinRequest(StreamInput in) throws IOException {
7272
public void writeTo(StreamOutput out) throws IOException {
7373
super.writeTo(out);
7474
sourceNode.writeTo(out);
75-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
75+
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
7676
out.writeLong(minimumTerm);
7777
}
7878
out.writeOptionalWriteable(optionalJoin.orElse(null));

0 commit comments

Comments
 (0)