Skip to content

Check relocating node id when finding source for reshard recovery #137848

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −1
Draft

Check relocating node id when finding source for reshard recovery #137848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb0b334
Check relocating node id when finding source for reshard recovery
jxie-1 Nov 10, 2025
3136dc6
Merge branch 'main' into reshard_relocate_source
jxie-1 Nov 10, 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
12 changes: 11 additions & 1 deletion server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,14 +1046,24 @@ private static DiscoveryNode findSourceNodeForReshardSplitRecovery(
return null;
}

if (sourceShardRouting.relocatingNodeId() != null) {
DiscoveryNode sourceNode = nodes.get(sourceShardRouting.relocatingNodeId());
if (sourceNode == null) {
logger.trace(
"can't find relocation reshard split source node for shard {} because it is assigned to an unknown node [{}].",
sourceShardRouting.shardId(),
sourceShardRouting.relocatingNodeId()
);
}
return sourceNode;
}
DiscoveryNode sourceNode = nodes.get(sourceShardRouting.currentNodeId());
if (sourceNode == null) {
assert false : "Source node for reshard does not exist: " + sourceShardRouting.currentNodeId();
logger.trace(
"can't find reshard split source node because source shard {} is assigned to an unknown node.",
sourceShardRouting.shortSummary()
);
return null;
}
return sourceNode;
}
Expand Down