Skip to content

Fixes based on resharding disruption tests #130870

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 3 commits into from
Jul 11, 2025
Merged

Fixes based on resharding disruption tests #130870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
911de24
Fixes based on resharding disruption tests
lkts Jul 8, 2025
2947315
Merge branch 'main' into reshard_disruption_test
elasticmachine Jul 11, 2025
93487b2
Merge branch 'main' into reshard_disruption_test
lkts Jul 11, 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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ protected void writeAdditionalFields(StreamOutput out) throws IOException {

@Override
public void addAdditionalFields(XContentBuilder builder, Params params) throws IOException {
sourceShardId.toXContent(builder, params);
builder.field("sourceShardId", sourceShardId);
}
}
}
4 changes: 2 additions & 2 deletions 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 @@ -1004,8 +1004,8 @@ private static DiscoveryNode findSourceNodeForReshardSplitRecovery(
ShardRouting sourceShardRouting = routingTable.shardRoutingTable(sourceShardId).primaryShard();

if (sourceShardRouting.active() == false) {
assert false : sourceShardRouting.shortSummary();
logger.trace("can't find reshard split source node because source shard {} is not active.", sourceShardRouting);
// Source shard is unassigned (likely due to failure), we will retry.
logger.trace("can't find reshard split source node because source shard {} is not active.", sourceShardRouting.shortSummary());
return null;
}

Expand Down