Skip to content

Remove Transport Version from Serialization #131750

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ private static boolean isDesiredShardAllocation(ShardRouting shardRouting, Desir

public static NodeBalanceStats readFrom(StreamInput in) throws IOException {
return new NodeBalanceStats(
in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0) ? in.readString() : UNKNOWN_NODE_ID,
in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0) ? in.readStringCollectionAsList() : List.of(),
in.readString(),
in.readStringCollectionAsList(),
in.readInt(),
in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0) ? in.readVInt() : -1,
in.readVInt(),
in.readDouble(),
in.readLong(),
in.readLong(),
Expand All @@ -286,14 +286,10 @@ public static NodeBalanceStats readFrom(StreamInput in) throws IOException {

@Override
public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
out.writeString(nodeId);
out.writeStringCollection(roles);
}
out.writeString(nodeId);
out.writeStringCollection(roles);
out.writeInt(shards);
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
out.writeVInt(undesiredShardAllocations);
}
out.writeVInt(undesiredShardAllocations);
out.writeDouble(forecastWriteLoad);
out.writeLong(forecastShardSize);
out.writeLong(actualShardSize);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,42 +56,6 @@ protected ClusterBalanceStats.NodeBalanceStats mutateInstance(ClusterBalanceStat
return createTestInstance();
}

public void testSerializationWithTransportVersionV_8_7_0() throws IOException {
ClusterBalanceStats.NodeBalanceStats instance = createTestInstance();
// Serialization changes based on this version
final var oldVersion = TransportVersionUtils.randomVersionBetween(
random(),
TransportVersions.V_8_0_0,
TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_8_0)
);
ClusterBalanceStats.NodeBalanceStats deserialized = copyInstance(instance, oldVersion);

// Assert the default values are as expected
assertEquals(UNKNOWN, deserialized.nodeId());
assertEquals(List.of(), deserialized.roles());
assertEquals(UNDESIRED_SHARD_ALLOCATION_DEFAULT_VALUE, deserialized.undesiredShardAllocations());
assertNull(deserialized.nodeWeight());
}

public void testSerializationWithTransportVersionV_8_8_0() throws IOException {
ClusterBalanceStats.NodeBalanceStats instance = createTestInstance();
// Serialization changes based on this version
final var oldVersion = TransportVersionUtils.randomVersionBetween(
random(),
TransportVersions.V_8_8_0,
TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_12_0)
);
ClusterBalanceStats.NodeBalanceStats deserialized = copyInstance(instance, oldVersion);

// Assert the values are as expected
assertEquals(instance.nodeId(), deserialized.nodeId());
assertEquals(instance.roles(), deserialized.roles());

// Assert the default values are as expected
assertEquals(UNDESIRED_SHARD_ALLOCATION_DEFAULT_VALUE, deserialized.undesiredShardAllocations());
assertNull(deserialized.nodeWeight());
}

public void testSerializationWithTransportVersionV_8_12_0() throws IOException {
ClusterBalanceStats.NodeBalanceStats instance = createTestInstance();
// Serialization changes based on this version
Expand Down