Skip to content

Commit

Permalink
Re-enable BwC Tests (#52110)
Browse files Browse the repository at this point in the history
Reenabling BwC Tests now that #52108 is merged.
  • Loading branch information
original-brownbear authored Feb 9, 2020
1 parent da5b35b commit cb34d1a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ task verifyVersions {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/52108" /* place a PR link here when committing bwc changes */
boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public SnapshotRecoverySource(String restoreUUID, Snapshot snapshot, Version ver
restoreUUID = in.readString();
snapshot = new Snapshot(in);
version = Version.readVersion(in);
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
index = new IndexId(in);
} else {
index = new IndexId(in.readString(), IndexMetaData.INDEX_UUID_NA_VALUE);
Expand Down Expand Up @@ -263,7 +263,7 @@ protected void writeAdditionalFields(StreamOutput out) throws IOException {
out.writeString(restoreUUID);
snapshot.writeTo(out);
Version.writeVersion(version, out);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
index.writeTo(out);
} else {
out.writeString(index.getName());
Expand Down

0 comments on commit cb34d1a

Please sign in to comment.