Skip to content

Commit 38ce11c

Browse files
tlrxhowardhuanghua
authored andcommitted
Reenable BWC tests and adapt BWC layer for Pause/Resume auto-follower API (elastic#47971)
This commit reenables bwc tests and adapts the bwc serialization layer for elastic#47904
1 parent 59e75bc commit 38ce11c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ task verifyVersions {
205205
* after the backport of the backcompat code is complete.
206206
*/
207207

208-
boolean bwc_tests_enabled = false
209-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/47904" /* place a PR link here when committing bwc changes */
208+
boolean bwc_tests_enabled = true
209+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
210210
if (bwc_tests_enabled == false) {
211211
if (bwc_tests_disabled_issue.isEmpty()) {
212212
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/auto_follow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
---
5757
"Test pause and resume auto follow pattern":
5858
- skip:
59-
version: " - 7.9.99"
60-
reason: "pause/resume auto-follow patterns is supported since 8.0"
59+
version: " - 7.4.99"
60+
reason: "pause/resume auto-follow patterns is supported since 7.5.0"
6161

6262
- do:
6363
cluster.state: {}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/AutoFollowMetadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ private AutoFollowPattern(String remoteCluster, List<String> leaderIndexPatterns
233233
this.remoteCluster = remoteCluster;
234234
this.leaderIndexPatterns = leaderIndexPatterns;
235235
this.followIndexPattern = followIndexPattern;
236-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
236+
if (in.getVersion().onOrAfter(Version.V_7_5_0)) {
237237
this.active = in.readBoolean();
238238
} else {
239239
this.active = true;
@@ -270,7 +270,7 @@ public void writeTo(StreamOutput out) throws IOException {
270270
out.writeStringCollection(leaderIndexPatterns);
271271
out.writeOptionalString(followIndexPattern);
272272
super.writeTo(out);
273-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
273+
if (out.getVersion().onOrAfter(Version.V_7_5_0)) {
274274
out.writeBoolean(active);
275275
}
276276
}

0 commit comments

Comments
 (0)