Skip to content

Commit 34fbb37

Browse files
committed
Explicitly prepare shard for peer recovery
This commit moves preparing a shard for peer recovery out of the method that prepares the recovery request as this was an odd place to change manipulate the state of the shard.
1 parent cea70f4 commit 34fbb37

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ private void doRecovery(final long recoveryId) {
184184

185185
cancellableThreads = recoveryTarget.cancellableThreads();
186186
timer = recoveryTarget.state().getTimer();
187+
188+
logger.trace("{} preparing shard for peer recovery", recoveryTarget.shardId());
189+
recoveryTarget.indexShard().prepareForIndexRecovery();
187190
}
188191

189192
try {
@@ -353,9 +356,6 @@ private Optional<StartRecoveryRequest> getStartRecoveryRequest(final RecoveryTar
353356
recoveryTarget.sourceNode());
354357
}
355358

356-
logger.trace("{} preparing shard for peer recovery", recoveryTarget.shardId());
357-
recoveryTarget.indexShard().prepareForIndexRecovery();
358-
359359
request = new StartRecoveryRequest(
360360
recoveryTarget.shardId(),
361361
recoveryTarget.sourceNode(),

0 commit comments

Comments
 (0)