Skip to content

Commit f8ed6c1

Browse files
authored
Enable BWC after backport recovering leases (#38485)
This commit enables the BWC tests after backporting recovery of retention leases during peer recovery.
1 parent 4b42281 commit f8ed6c1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ task verifyVersions {
159159
* the enabled state of every bwc task. It should be set back to true
160160
* after the backport of the backcompat code is complete.
161161
*/
162-
final boolean bwc_tests_enabled = false
163-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/38435" /* place a PR link here when committing bwc changes */
162+
final boolean bwc_tests_enabled = true
163+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
164164
if (bwc_tests_enabled == false) {
165165
if (bwc_tests_disabled_issue.isEmpty()) {
166166
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void readFrom(StreamInput in) throws IOException {
108108
// UNASSIGNED_SEQ_NO means uninitialized and replica won't enable optimization using seq_no
109109
maxSeqNoOfUpdatesOrDeletesOnPrimary = SequenceNumbers.UNASSIGNED_SEQ_NO;
110110
}
111-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
111+
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
112112
retentionLeases = new RetentionLeases(in);
113113
} else {
114114
retentionLeases = RetentionLeases.EMPTY;
@@ -128,7 +128,7 @@ public void writeTo(StreamOutput out) throws IOException {
128128
if (out.getVersion().onOrAfter(Version.V_6_5_0)) {
129129
out.writeZLong(maxSeqNoOfUpdatesOrDeletesOnPrimary);
130130
}
131-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
131+
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
132132
retentionLeases.writeTo(out);
133133
}
134134
}

0 commit comments

Comments
 (0)