Skip to content

Replace deprecated routingTable table call in tests #131005

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 4 commits into from
Jul 16, 2025
Merged

Replace deprecated routingTable table call in tests #131005

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1c16cf
Replace deprecated routingTable table call in tests
idegtiarenko Jul 10, 2025
e3c5383
Merge branch 'main' into replace_deprecated_routing_call
idegtiarenko Jul 15, 2025
6b9aa4d
update usage
idegtiarenko Jul 15, 2025
d88bbb6
Merge branch 'main' into replace_deprecated_routing_call
idegtiarenko Jul 16, 2025
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
10 changes: 4 additions & 6 deletions ...internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.project.TestProjectResolvers;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.compute.operator.exchange.ExchangeService;
Expand Down Expand Up @@ -131,12 +132,9 @@ public void testRetryOnShardMovement() {
(handler, request, channel, task) -> {
// move index shard
if (shouldMove.compareAndSet(true, false)) {
var currentShardNodeId = clusterService().state()
.routingTable()
.index("index-1")
.shard(0)
.primaryShard()
.currentNodeId();
var projectState = TestProjectResolvers.DEFAULT_PROJECT_ONLY.getProjectState(clusterService().state());
Copy link
Contributor Author

@idegtiarenko idegtiarenko Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nielsbauman, I believe we do not run out integration tests with multi-project set up, but please let me know if there is a better way to replace this call.

Copy link
Contributor

@nielsbauman nielsbauman Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we do not run out integration tests with multi-project set up

Yep, that's exactly right. We've talked about adding test infrastructure for running integration tests with multiple projects, but we haven't decided/started on that yet.

My suggestion would be to do:

var shardRouting = clusterService().state().routingTable(ProjectId.DEFAULT).shardRoutingTable("index-1", 0);

That avoids the unnecessary conversion to ProjectState and it avoids the dependency on the project resolver. I hope that makes sense. Let me know if you have concerns or questions.

var shardRouting = projectState.routingTable().shardRoutingTable("index-1", 0);
var currentShardNodeId = shardRouting.primaryShard().currentNodeId();
assertAcked(
client().admin()
.indices()
Expand Down