Skip to content

Commit 6784f54

Browse files
authored
Backport Fix ClusterSearchShardsResponseTests#testSerialization (#102005)
1 parent 4ab056e commit 6784f54

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package org.elasticsearch.action.admin.cluster.shards;
1010

1111
import org.elasticsearch.TransportVersion;
12+
import org.elasticsearch.Version;
1213
import org.elasticsearch.cluster.node.DiscoveryNode;
1314
import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
1415
import org.elasticsearch.cluster.routing.ShardRouting;
@@ -20,13 +21,13 @@
2021
import org.elasticsearch.common.io.stream.StreamInput;
2122
import org.elasticsearch.common.settings.Settings;
2223
import org.elasticsearch.common.transport.TransportAddress;
24+
import org.elasticsearch.index.IndexVersion;
2325
import org.elasticsearch.index.query.RandomQueryBuilder;
2426
import org.elasticsearch.index.shard.ShardId;
2527
import org.elasticsearch.search.SearchModule;
2628
import org.elasticsearch.search.internal.AliasFilter;
2729
import org.elasticsearch.test.ESTestCase;
2830
import org.elasticsearch.test.TransportVersionUtils;
29-
import org.elasticsearch.test.VersionUtils;
3031

3132
import java.util.ArrayList;
3233
import java.util.Collections;
@@ -36,6 +37,8 @@
3637
import java.util.Map;
3738
import java.util.Set;
3839

40+
import static org.elasticsearch.test.VersionUtils.randomCompatibleVersion;
41+
3942
public class ClusterSearchShardsResponseTests extends ESTestCase {
4043

4144
public void testSerialization() throws Exception {
@@ -49,12 +52,10 @@ public void testSerialization() throws Exception {
4952
String nodeId = randomAlphaOfLength(10);
5053
ShardRouting shardRouting = TestShardRouting.newShardRouting(shardId, nodeId, randomBoolean(), ShardRoutingState.STARTED);
5154
clusterSearchShardsGroups[i] = new ClusterSearchShardsGroup(shardId, new ShardRouting[] { shardRouting });
52-
DiscoveryNode node = DiscoveryNodeUtils.create(
53-
shardRouting.currentNodeId(),
54-
new TransportAddress(TransportAddress.META_ADDRESS, randomInt(0xFFFF)),
55-
VersionUtils.randomVersion(random())
56-
);
57-
nodes.add(node);
55+
DiscoveryNodeUtils.Builder node = DiscoveryNodeUtils.builder(shardRouting.currentNodeId())
56+
.address(new TransportAddress(TransportAddress.META_ADDRESS, randomInt(0xFFFF)))
57+
.version(randomCompatibleVersion(random(), Version.CURRENT), IndexVersion.MINIMUM_COMPATIBLE, IndexVersion.current());
58+
nodes.add(node.build());
5859
AliasFilter aliasFilter;
5960
if (randomBoolean()) {
6061
aliasFilter = AliasFilter.of(RandomQueryBuilder.createQuery(random()), "alias-" + index);

0 commit comments

Comments
 (0)