Skip to content

Commit 10fe741

Browse files
Remove Transport Version from Serialization (#131750)
Removes conditional statements from the `NodeBalanceStats` `readFrom` and `writeTo` methods that serialised depending on `TransportVersions .V_8_8_0` and `TransportVersions.V_8_12_0` since these transport versions are old and can be removed. Jira: ES-10337
1 parent 1e120b5 commit 10fe741

File tree

2 files changed

+6
-46
lines changed

2 files changed

+6
-46
lines changed

server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterBalanceStats.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ private static boolean isDesiredShardAllocation(ShardRouting shardRouting, Desir
265265

266266
public static NodeBalanceStats readFrom(StreamInput in) throws IOException {
267267
return new NodeBalanceStats(
268-
in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0) ? in.readString() : UNKNOWN_NODE_ID,
269-
in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0) ? in.readStringCollectionAsList() : List.of(),
268+
in.readString(),
269+
in.readStringCollectionAsList(),
270270
in.readInt(),
271-
in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0) ? in.readVInt() : -1,
271+
in.readVInt(),
272272
in.readDouble(),
273273
in.readLong(),
274274
in.readLong(),
@@ -280,14 +280,10 @@ public static NodeBalanceStats readFrom(StreamInput in) throws IOException {
280280

281281
@Override
282282
public void writeTo(StreamOutput out) throws IOException {
283-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
284-
out.writeString(nodeId);
285-
out.writeStringCollection(roles);
286-
}
283+
out.writeString(nodeId);
284+
out.writeStringCollection(roles);
287285
out.writeInt(shards);
288-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
289-
out.writeVInt(undesiredShardAllocations);
290-
}
286+
out.writeVInt(undesiredShardAllocations);
291287
out.writeDouble(forecastWriteLoad);
292288
out.writeLong(forecastShardSize);
293289
out.writeLong(actualShardSize);

server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/NodeBalanceStatsTests.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -56,42 +56,6 @@ protected ClusterBalanceStats.NodeBalanceStats mutateInstance(ClusterBalanceStat
5656
return createTestInstance();
5757
}
5858

59-
public void testSerializationWithTransportVersionV_8_7_0() throws IOException {
60-
ClusterBalanceStats.NodeBalanceStats instance = createTestInstance();
61-
// Serialization changes based on this version
62-
final var oldVersion = TransportVersionUtils.randomVersionBetween(
63-
random(),
64-
TransportVersions.V_8_0_0,
65-
TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_8_0)
66-
);
67-
ClusterBalanceStats.NodeBalanceStats deserialized = copyInstance(instance, oldVersion);
68-
69-
// Assert the default values are as expected
70-
assertEquals(UNKNOWN, deserialized.nodeId());
71-
assertEquals(List.of(), deserialized.roles());
72-
assertEquals(UNDESIRED_SHARD_ALLOCATION_DEFAULT_VALUE, deserialized.undesiredShardAllocations());
73-
assertNull(deserialized.nodeWeight());
74-
}
75-
76-
public void testSerializationWithTransportVersionV_8_8_0() throws IOException {
77-
ClusterBalanceStats.NodeBalanceStats instance = createTestInstance();
78-
// Serialization changes based on this version
79-
final var oldVersion = TransportVersionUtils.randomVersionBetween(
80-
random(),
81-
TransportVersions.V_8_8_0,
82-
TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_12_0)
83-
);
84-
ClusterBalanceStats.NodeBalanceStats deserialized = copyInstance(instance, oldVersion);
85-
86-
// Assert the values are as expected
87-
assertEquals(instance.nodeId(), deserialized.nodeId());
88-
assertEquals(instance.roles(), deserialized.roles());
89-
90-
// Assert the default values are as expected
91-
assertEquals(UNDESIRED_SHARD_ALLOCATION_DEFAULT_VALUE, deserialized.undesiredShardAllocations());
92-
assertNull(deserialized.nodeWeight());
93-
}
94-
9559
public void testSerializationWithTransportVersionV_8_12_0() throws IOException {
9660
ClusterBalanceStats.NodeBalanceStats instance = createTestInstance();
9761
// Serialization changes based on this version

0 commit comments

Comments
 (0)