Skip to content

Commit b386340

Browse files
[ML] Unmute DF Analytics BWC tests and fix versions for memory_usage (#52981)
Relates #52778
1 parent 1e0ba70 commit b386340

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/action/GetDataFrameAnalyticsStatsAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public Stats(StreamInput in) throws IOException {
192192
} else {
193193
progress = in.readList(PhaseProgress::new);
194194
}
195-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
195+
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
196196
memoryUsage = in.readOptionalWriteable(MemoryUsage::new);
197197
} else {
198198
memoryUsage = null;
@@ -315,7 +315,7 @@ public void writeTo(StreamOutput out) throws IOException {
315315
} else {
316316
out.writeList(progress);
317317
}
318-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
318+
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
319319
out.writeOptionalWriteable(memoryUsage);
320320
}
321321
out.writeOptionalWriteable(node);

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

Lines changed: 0 additions & 5 deletions
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/pull/52778"
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

Lines changed: 0 additions & 3 deletions
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/pull/52778"
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

Lines changed: 0 additions & 5 deletions
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/pull/52778"
5-
61
---
72
"Get old cluster outlier_detection job":
83

0 commit comments

Comments
 (0)