honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 06:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable Bwc Tests (#39551)

Browse Source 
* Disable Bwc Tests
* For #39550
This commit is contained in:
Armin Braun 2019-03-04 10:41:52 +01:00 committed by GitHub
parent 65732d707f
commit 68bc178017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -159,8 +159,8 @@ task verifyVersions {
* the enabled state of every bwc task. It should be set back to true * the enabled state of every bwc task. It should be set back to true
* after the backport of the backcompat code is complete. * after the backport of the backcompat code is complete.
*/ */
boolean bwc_tests_enabled = true boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/39550" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) { if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) { if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false") throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

4
server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java
View File

@ -446,7 +446,7 @@ public class SnapshotsInProgress extends AbstractNamedDiffable<Custom> implement
} }
long repositoryStateId = in.readLong(); long repositoryStateId = in.readLong();
final String failure; final String failure;
if (in.getVersion().onOrAfter(Version.V_7_0_0)) { if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
failure = in.readOptionalString(); failure = in.readOptionalString();
} else { } else {
failure = null; failure = null;
@ -488,7 +488,7 @@ public class SnapshotsInProgress extends AbstractNamedDiffable<Custom> implement
} }
} }
out.writeLong(entry.repositoryStateId); out.writeLong(entry.repositoryStateId);
if (out.getVersion().onOrAfter(Version.V_7_0_0)) { if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
out.writeOptionalString(entry.failure); out.writeOptionalString(entry.failure);
} }
} }