Skip to content

Commit dde2a06

Browse files
[ML] Fix DFA source filtering versions and unmute BWC tests (elastic#49725)
Relates elastic#49690
1 parent b134204 commit dde2a06

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public DataFrameAnalyticsSource(String[] index, @Nullable QueryProvider queryPro
7777
public DataFrameAnalyticsSource(StreamInput in) throws IOException {
7878
index = in.readStringArray();
7979
queryProvider = QueryProvider.fromStream(in);
80-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
80+
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
8181
sourceFiltering = in.readOptionalWriteable(FetchSourceContext::new);
8282
} else {
8383
sourceFiltering = null;
@@ -95,7 +95,7 @@ public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) {
9595
public void writeTo(StreamOutput out) throws IOException {
9696
out.writeStringArray(index);
9797
queryProvider.writeTo(out);
98-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
98+
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
9999
out.writeOptionalWriteable(sourceFiltering);
100100
}
101101
}

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/49690"
5-
61
---
72
"Get old outlier_detection job":
83

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/49690"
52

63
- do:
74
index:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/49690"
5-
61
---
72
"Get old cluster outlier_detection job":
83

0 commit comments

Comments
 (0)