Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ML] fixing datafeed bwc tests #52908

Merged
merged 3 commits into from
Feb 28, 2020
Merged

[ML] fixing datafeed bwc tests #52908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ceba71
[ML] Unmuting and fixing datafeed tests
benwtrent Feb 26, 2020
d941a48
Merge remote-tracking branch 'upstream/master' into feature/ml-datafe…
benwtrent Feb 27, 2020
d544abb
Fixing ML datafeed bwc tests after backport 52793
benwtrent Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public DatafeedConfig(StreamInput in) throws IOException {
} else {
maxEmptySearches = null;
}
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
indicesOptions = IndicesOptions.readIndicesOptions(in);
} else {
indicesOptions = SearchRequest.DEFAULT_INDICES_OPTIONS;
Expand Down Expand Up @@ -448,7 +448,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_7_5_0)) {
out.writeOptionalVInt(maxEmptySearches);
}
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
indicesOptions.writeIndicesOptions(out);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public DatafeedUpdate(StreamInput in) throws IOException {
} else {
maxEmptySearches = null;
}
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
indicesOptions = in.readBoolean() ? IndicesOptions.readIndicesOptions(in) : null;
} else {
indicesOptions = null;
Expand Down Expand Up @@ -207,7 +207,7 @@ public void writeTo(StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_7_5_0)) {
out.writeOptionalInt(maxEmptySearches);
}
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
if (indicesOptions != null) {
out.writeBoolean(true);
indicesOptions.writeIndicesOptions(out);
Expand Down
8 changes: 0 additions & 8 deletions ...lling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
setup:
- skip:
reason: "Waiting for backport of https://github.com/elastic/elasticsearch/pull/52793"
version: all

---
"Test old cluster datafeed without aggs":
- skip:
version: "all"
reason: "Awaits fix: https://github.com/elastic/elasticsearch/issues/52739"
- do:
ml.get_datafeeds:
datafeed_id: old-cluster-datafeed-without-aggs
Expand Down
4 changes: 0 additions & 4 deletions ...rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
setup:
- skip:
reason: "Waiting for backport of https://github.com/elastic/elasticsearch/pull/52793"
version: all
---
"Put job and datafeed without aggs in old cluster":

Expand Down
3 changes: 0 additions & 3 deletions ...ng-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
setup:
- skip:
reason: "Waiting for backport of https://github.com/elastic/elasticsearch/pull/52793"
version: all
- do:
cluster.health:
wait_for_status: green
Expand Down