Skip to content

[8.3] [ML] Fix trained model metadata serialization (#87817) #87822

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
Jun 18, 2022
Merged

[8.3] [ML] Fix trained model metadata serialization (#87817) #87822

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
2 changes: 1 addition & 1 deletion ...org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentClusterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ private static ClusterState forceUpdate(ClusterState currentState, TrainedModelA
metadata.putCustom(TrainedModelAssignmentMetadata.NAME, modelAssignments.build())
.removeCustom(TrainedModelAssignmentMetadata.DEPRECATED_NAME);
} else {
metadata.putCustom(TrainedModelAssignmentMetadata.DEPRECATED_NAME, modelAssignments.build());
metadata.putCustom(TrainedModelAssignmentMetadata.DEPRECATED_NAME, modelAssignments.buildOld());
}
return ClusterState.builder(currentState).metadata(metadata).build();
}
Expand Down
16 changes: 14 additions & 2 deletions .../java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,12 @@ public static Optional<TrainedModelAssignment> assignmentForModelId(ClusterState
}

public TrainedModelAssignmentMetadata(Map<String, TrainedModelAssignment> modelRoutingEntries) {
this(modelRoutingEntries, NAME);
}

private TrainedModelAssignmentMetadata(Map<String, TrainedModelAssignment> modelRoutingEntries, String writeableName) {
this.modelRoutingEntries = ExceptionsHelper.requireNonNull(modelRoutingEntries, NAME);
this.writeableName = NAME;
this.writeableName = writeableName;
}

private TrainedModelAssignmentMetadata(StreamInput in, String writeableName) throws IOException {
Expand Down Expand Up @@ -195,9 +199,17 @@ public boolean isChanged() {
}

public TrainedModelAssignmentMetadata build() {
return build(NAME);
}

public TrainedModelAssignmentMetadata buildOld() {
return build(DEPRECATED_NAME);
}

private TrainedModelAssignmentMetadata build(String writeableName) {
Map<String, TrainedModelAssignment> assignments = new LinkedHashMap<>();
modelRoutingEntries.forEach((modelId, assignment) -> assignments.put(modelId, assignment.build()));
return new TrainedModelAssignmentMetadata(assignments);
return new TrainedModelAssignmentMetadata(assignments, writeableName);
}
}

Expand Down