Skip to content

Executing shard recovery in project context #130525

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

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

Executing shard recovery in project context #130525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82a775
executing shard recovery in project context
ywangd Jul 3, 2025
e0261ba
Merge remote-tracking branch 'origin/main' into es-4123-fix
ywangd 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
5 changes: 4 additions & 1 deletion server/src/main/java/org/elasticsearch/indices/IndicesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.elasticsearch.core.AbstractRefCounted;
import org.elasticsearch.core.CheckedConsumer;
import org.elasticsearch.core.CheckedFunction;
import org.elasticsearch.core.CheckedRunnable;
import org.elasticsearch.core.IOUtils;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Releasable;
Expand Down Expand Up @@ -950,6 +951,7 @@ public synchronized void verifyIndexMetadata(IndexMetadata metadata, IndexMetada

@Override
public void createShard(
final ProjectId projectId,
final ShardRouting shardRouting,
final PeerRecoveryTargetService recoveryTargetService,
final PeerRecoveryTargetService.RecoveryListener recoveryListener,
Expand All @@ -968,7 +970,7 @@ public void createShard(
RecoveryState recoveryState = indexService.createRecoveryState(shardRouting, targetNode, sourceNode);
IndexShard indexShard = indexService.createShard(shardRouting, globalCheckpointSyncer, retentionLeaseSyncer);
indexShard.addShardFailureCallback(onShardFailure);
indexShard.startRecovery(
final CheckedRunnable<RuntimeException> recoveryRunnable = () -> indexShard.startRecovery(
Copy link
Member

Choose a reason for hiding this comment

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

Using RuntimeException for CheckedRunnable doesn't seem right. Maybe just inline the indexShard.startRecovery?

recoveryState,
recoveryTargetService,
postRecoveryMerger.maybeMergeAfterRecovery(indexService.getMetadata(), shardRouting, recoveryListener),
Expand All @@ -989,6 +991,7 @@ public void createShard(
this,
clusterStateVersion
);
projectResolver.executeOnProject(projectId, recoveryRunnable);
}

@Override
Expand Down
4 changes: 4 additions & 0 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 @@ -26,6 +26,7 @@
import org.elasticsearch.cluster.ClusterStateApplier;
import org.elasticsearch.cluster.action.shard.ShardStateAction;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
Expand Down Expand Up @@ -781,6 +782,7 @@ private void createShardWhenLockAvailable(
try {
logger.debug("{} creating shard with primary term [{}], iteration [{}]", shardRouting.shardId(), primaryTerm, iteration);
indicesService.createShard(
originalState.metadata().projectFor(shardRouting.index()).id(),
shardRouting,
recoveryTargetService,
new RecoveryListener(shardRouting, primaryTerm),
Expand Down Expand Up @@ -1330,6 +1332,7 @@ void removeIndex(
/**
* Creates a shard for the specified shard routing and starts recovery.
*
* @param projectId the project for the shard
* @param shardRouting the shard routing
* @param recoveryTargetService recovery service for the target
* @param recoveryListener a callback when recovery changes state (finishes or fails)
Expand All @@ -1343,6 +1346,7 @@ void removeIndex(
* @throws IOException if an I/O exception occurs when creating the shard
*/
void createShard(
ProjectId projectId,
ShardRouting shardRouting,
PeerRecoveryTargetService recoveryTargetService,
PeerRecoveryTargetService.RecoveryListener recoveryListener,
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
Expand Down Expand Up @@ -242,6 +243,7 @@ public MockIndexService indexService(Index index) {

@Override
public void createShard(
final ProjectId projectId,
final ShardRouting shardRouting,
final PeerRecoveryTargetService recoveryTargetService,
final PeerRecoveryTargetService.RecoveryListener recoveryListener,
Expand Down