honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable bwc tests now that #38443 is backported. (#38462)

This commit is contained in:
Martijn van Groningen 2019-02-06 00:04:43 +01:00 committed by GitHub
parent 34f2cc78f6
commit 8972ebabdd
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.
*/ */
final boolean bwc_tests_enabled = false final boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/38443" /* place a PR link here when committing bwc changes */ final String bwc_tests_disabled_issue = "" /* 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
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ccr/action/PutAutoFollowPatternAction.java
View File

@ -153,7 +153,7 @@ public class PutAutoFollowPatternAction extends Action<AcknowledgedResponse> {
remoteCluster = in.readString(); remoteCluster = in.readString();
leaderIndexPatterns = in.readStringList(); leaderIndexPatterns = in.readStringList();
followIndexNamePattern = in.readOptionalString(); followIndexNamePattern = in.readOptionalString();
if (in.getVersion().onOrAfter(Version.V_7_0_0)) { if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
parameters = new FollowParameters(in); parameters = new FollowParameters(in);
} else { } else {
parameters = new FollowParameters(); parameters = new FollowParameters();
@ -177,7 +177,7 @@ public class PutAutoFollowPatternAction extends Action<AcknowledgedResponse> {
out.writeString(remoteCluster); out.writeString(remoteCluster);
out.writeStringCollection(leaderIndexPatterns); out.writeStringCollection(leaderIndexPatterns);
out.writeOptionalString(followIndexNamePattern); out.writeOptionalString(followIndexNamePattern);
if (out.getVersion().onOrAfter(Version.V_7_0_0)) { if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
parameters.writeTo(out); parameters.writeTo(out);
} else { } else {
out.writeOptionalVInt(parameters.maxReadRequestOperationCount); out.writeOptionalVInt(parameters.maxReadRequestOperationCount);