Skip to content

[7.4] [ML][Transforms] fix bwc serialization with 7.3 (#48021) #48052

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

Merged
merged 1 commit into from
Oct 15, 2019
Merged

[7.4] [ML][Transforms] fix bwc serialization with 7.3 (#48021) #48052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .../main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public DataFrameTransformStats(StreamInput in) throws IOException {
DataFrameTransformState transformState = new DataFrameTransformState(in);
this.state = State.fromComponents(transformState.getTaskState(), transformState.getIndexerState());
this.reason = transformState.getReason();
this.node = null;
this.node = transformState.getNode();
this.indexerStats = new DataFrameIndexerTransformStats(in);
this.checkpointingInfo = new DataFrameTransformCheckpointingInfo(in);
}
Expand Down Expand Up @@ -171,8 +171,8 @@ public void writeTo(StreamOutput out) throws IOException {
checkpointingInfo.getNext().getPosition(),
checkpointingInfo.getLast().getCheckpoint(),
reason,
checkpointingInfo.getNext().getCheckpointProgress()).writeTo(out);
out.writeBoolean(false);
checkpointingInfo.getNext().getCheckpointProgress(),
node).writeTo(out);
indexerStats.writeTo(out);
checkpointingInfo.writeTo(out);
}
Expand Down
30 changes: 30 additions & 0 deletions .../java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@

package org.elasticsearch.xpack.core.dataframe.transforms;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.Writeable.Reader;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.test.AbstractSerializingTestCase;

import java.io.IOException;
import java.util.function.Predicate;

import static org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformStats.State.STARTED;
import static org.hamcrest.Matchers.equalTo;

public class DataFrameTransformStatsTests extends AbstractSerializingTestCase<DataFrameTransformStats> {

public static DataFrameTransformStats randomDataFrameTransformStats() {
Expand Down Expand Up @@ -53,4 +59,28 @@ protected String[] getShuffleFieldsExceptions() {
protected Predicate<String> getRandomFieldsExcludeFilter() {
return field -> !field.isEmpty();
}

public void testBwcWith73() throws IOException {
for(int i = 0; i < NUMBER_OF_TEST_RUNS; i++) {
DataFrameTransformStats stats = new DataFrameTransformStats("bwc-id",
STARTED,
randomBoolean() ? null : randomAlphaOfLength(100),
randomBoolean() ? null : NodeAttributeTests.randomNodeAttributes(),
new DataFrameIndexerTransformStats(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
new DataFrameTransformCheckpointingInfo(
new DataFrameTransformCheckpointStats(0, null, null, 10, 100),
new DataFrameTransformCheckpointStats(0, null, null, 100, 1000),
// changesLastDetectedAt aren't serialized back
100, null));
try (BytesStreamOutput output = new BytesStreamOutput()) {
output.setVersion(Version.V_7_3_0);
stats.writeTo(output);
try (StreamInput in = output.bytes().streamInput()) {
in.setVersion(Version.V_7_3_0);
DataFrameTransformStats statsFromOld = new DataFrameTransformStats(in);
assertThat(statsFromOld, equalTo(stats));
}
}
}
}
}