Skip to content

Fix race condition in SnapshotBasedIndexRecoveryIT #79404

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 8 commits into from
Nov 29, 2021
Merged

Fix race condition in SnapshotBasedIndexRecoveryIT #79404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b67ab1
Fix race condition in SnapshotBasedIndexRecoveryIT
fcofdez Oct 19, 2021
77f6bbc
Merge remote-tracking branch 'origin/master' into fix-snapshot-based-…
fcofdez Oct 19, 2021
a884aba
More robust fix
fcofdez Oct 19, 2021
994b458
Merge remote-tracking branch 'origin/master' into fix-snapshot-based-…
fcofdez Oct 27, 2021
714d98b
Merge branch 'master' into fix-snapshot-based-index-recovery-it
elasticmachine Oct 28, 2021
af47a40
Merge remote-tracking branch 'origin/master' into fix-snapshot-based-…
fcofdez Nov 24, 2021
7921065
Review nits
fcofdez Nov 24, 2021
03da57c
Merge remote-tracking branch 'origin/master' into fix-snapshot-based-…
fcofdez Nov 29, 2021
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
7 changes: 6 additions & 1 deletion server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public void beforeIndexShardClosed(ShardId shardId, @Nullable IndexShard indexSh
}

public void startRecovery(final IndexShard indexShard, final DiscoveryNode sourceNode, final RecoveryListener listener) {
final Releasable snapshotFileDownloadsPermit = recoverySettings.tryAcquireSnapshotDownloadPermits();
final Releasable snapshotFileDownloadsPermit = tryAcquireSnapshotDownloadPermits();
// create a new recovery status, and process...
final long recoveryId = onGoingRecoveries.startRecovery(
indexShard,
Expand Down Expand Up @@ -258,6 +258,11 @@ private void doRecovery(final long recoveryId, final StartRecoveryRequest preExi
);
}

// Visible for testing
public Releasable tryAcquireSnapshotDownloadPermits() {
return recoverySettings.tryAcquireSnapshotDownloadPermits();
}

/**
* Prepare the start recovery request.
*
Expand Down
23 changes: 20 additions & 3 deletions ...rg/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.core.CheckedRunnable;
import org.elasticsearch.core.Releasable;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.MergePolicyConfig;
Expand Down Expand Up @@ -85,6 +86,7 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

import static org.elasticsearch.cluster.routing.allocation.decider.MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY;
import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING;
import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_MAX_CONCURRENT_SNAPSHOT_FILE_DOWNLOADS;
import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_MAX_CONCURRENT_SNAPSHOT_FILE_DOWNLOADS_PER_NODE;
Expand Down Expand Up @@ -914,7 +916,6 @@ public void testRecoveryUsingSnapshotsIsThrottledPerNode() throws Exception {
);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/79420")
public void testRecoveryUsingSnapshotsPermitIsReturnedAfterFailureOrCancellation() throws Exception {
executeRecoveryWithSnapshotFileDownloadThrottled(
(
Expand All @@ -930,7 +931,12 @@ public void testRecoveryUsingSnapshotsPermitIsReturnedAfterFailureOrCancellation
client().admin()
.indices()
.prepareUpdateSettings(indexRecoveredFromSnapshot1)
.setSettings(Settings.builder().put("index.routing.allocation.require._name", targetNode))
.setSettings(
Settings.builder()
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1)
.put("index.routing.allocation.require._name", (String) null)
.put("index.routing.allocation.include._name", sourceNode + "," + targetNode)
)
.get()
);

Expand Down Expand Up @@ -963,6 +969,16 @@ public void testRecoveryUsingSnapshotsPermitIsReturnedAfterFailureOrCancellation

targetMockTransportService.clearAllRules();
channelRef.get().sendResponse(new IOException("unable to clean files"));
PeerRecoveryTargetService peerRecoveryTargetService = internalCluster().getInstance(
PeerRecoveryTargetService.class,
targetNode
);
assertBusy(() -> {
// Wait until the current RecoveryTarget releases the snapshot download permit
try (Releasable snapshotDownloadPermit = peerRecoveryTargetService.tryAcquireSnapshotDownloadPermits()) {
assertThat(snapshotDownloadPermit, is(notNullValue()));
}
});
}

String indexRecoveredFromSnapshot2 = indices.get(1);
Expand Down Expand Up @@ -1140,10 +1156,11 @@ private void executeRecoveryWithSnapshotFileDownloadThrottled(SnapshotBasedRecov
indexName,
Settings.builder()
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
.put(MergePolicyConfig.INDEX_MERGE_ENABLED, false)
.put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "1s")
.put("index.routing.allocation.require._name", dataNodes.get(0))
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
.put(SETTING_ALLOCATION_MAX_RETRY.getKey(), 0)
.build()
);
indices.add(indexName);
Expand Down