Skip to content

Commit 2069e38

Browse files
droberts195jkakavas
authored andcommitted
[ML-DataFrame] Adjust data frame stats BWC following backport (#44852)
This change adjusts the changes of #44768 to account for the backport to the 7.x branch in #44848.
1 parent 83db007 commit 2069e38

File tree

4 files changed

+2
-26
lines changed

4 files changed

+2
-26
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ public DataFrameIndexerTransformStats(DataFrameIndexerTransformStats other) {
7676

7777
public DataFrameIndexerTransformStats(StreamInput in) throws IOException {
7878
super(in);
79-
if (in.getVersion().before(Version.V_8_0_0)) { // TODO change to 7.4.0 after backport
79+
if (in.getVersion().before(Version.V_7_4_0)) {
8080
in.readString(); // was transformId
8181
}
8282
}
8383

8484
@Override
8585
public void writeTo(StreamOutput out) throws IOException {
8686
super.writeTo(out);
87-
if (out.getVersion().before(Version.V_8_0_0)) { // TODO change to 7.4.0 after backport
87+
if (out.getVersion().before(Version.V_7_4_0)) {
8888
out.writeString(DEFAULT_TRANSFORM_ID);
8989
}
9090
}

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

-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
"Test put batch data frame transforms on mixed cluster":
3-
- skip:
4-
version: "7.4.0 - "
5-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
63
- do:
74
cluster.health:
85
index: "dataframe-transform-airline-data"
@@ -109,9 +106,6 @@
109106

110107
---
111108
"Test put continuous data frame transform on mixed cluster":
112-
- skip:
113-
version: "7.4.0 - "
114-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
115109
- do:
116110
cluster.health:
117111
index: "dataframe-transform-airline-data-cont"
@@ -174,9 +168,6 @@
174168

175169
---
176170
"Test GET, start, and stop old cluster batch transforms":
177-
- skip:
178-
version: "7.4.0 - "
179-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
180171
- do:
181172
cluster.health:
182173
index: "dataframe-transform-airline-data"
@@ -254,9 +245,6 @@
254245

255246
---
256247
"Test GET, stop, start, old continuous transforms":
257-
- skip:
258-
version: "7.4.0 - "
259-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
260248
- do:
261249
cluster.health:
262250
index: "dataframe-transform-airline-data-cont"

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

-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
"Test put batch data frame transforms on old cluster":
3-
- skip:
4-
version: "7.4.0 - "
5-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
63
- do:
74
indices.create:
85
index: dataframe-transform-airline-data
@@ -139,9 +136,6 @@
139136

140137
---
141138
"Test put continuous data frame transform on old cluster":
142-
- skip:
143-
version: "7.4.0 - "
144-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
145139
- do:
146140
indices.create:
147141
index: dataframe-transform-airline-data-cont

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

-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ setup:
77
timeout: 70s
88
---
99
"Get start, stop, and delete old and mixed cluster batch data frame transforms":
10-
- skip:
11-
version: "7.4.0 - "
12-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
1310
# Simple and complex OLD transforms
1411
- do:
1512
data_frame.get_data_frame_transform:
@@ -165,9 +162,6 @@ setup:
165162

166163
---
167164
"Test GET, stop, delete, old and mixed continuous transforms":
168-
- skip:
169-
version: "7.4.0 - "
170-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44768
171165
- do:
172166
data_frame.get_data_frame_transform:
173167
transform_id: "old-simple-continuous-transform"

0 commit comments

Comments
 (0)