Skip to content
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

Fix Bug with Concurrent Snapshot and Index Delete #73456

Merged
merged 6 commits into from
May 27, 2021
Merged

Fix Bug with Concurrent Snapshot and Index Delete #73456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e34407e
Fix Bug with Concurrent Snapshot and Index Delete
original-brownbear May 27, 2021
8a75cbe
fix weird assertion
original-brownbear May 27, 2021
ac21bbe
fix weird assertion
original-brownbear May 27, 2021
da3d79b
slightly shorter
original-brownbear May 27, 2021
030841c
Merge remote-tracking branch 'elastic/master' into fix-snapshot-bug
original-brownbear May 27, 2021
4b189a1
tidy up
original-brownbear May 27, 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
65 changes: 65 additions & 0 deletions ...ternalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.carrotsearch.hppc.IntHashSet;
import com.carrotsearch.hppc.IntSet;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse;
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
Expand All @@ -19,7 +20,9 @@
import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
import org.elasticsearch.action.admin.indices.stats.ShardStats;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.support.ActionTestUtils;
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.cluster.SnapshotsInProgress;
Expand All @@ -33,6 +36,7 @@
import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.common.util.set.Sets;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.seqno.RetentionLeaseActions;
import org.elasticsearch.index.seqno.RetentionLeases;
import org.elasticsearch.index.shard.ShardId;
Expand Down Expand Up @@ -72,6 +76,7 @@
import java.util.List;
import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
Expand All @@ -87,6 +92,7 @@
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.not;
Expand Down Expand Up @@ -1007,6 +1013,65 @@ public void testPartialSnapshotsDoNotRecordDeletedShardFailures() throws Excepti
assertThat(snapshotInfo.shardFailures(), empty());
}

public void testDeleteIndexDuringSnapshot() throws Exception {
final String indexName = "test-idx";
assertAcked(prepareCreate(indexName, 1, indexSettingsNoReplicas(1)));
ensureGreen();
indexRandomDocs(indexName, 100);

final String repoName = "test-repo";
createRepository(repoName, "fs");

final String firstSnapshotName = "test-snap";
createSnapshot(repoName, firstSnapshotName, List.of(indexName));
final int concurrentLoops = randomIntBetween(2, 5);
final List<Future<Void>> futures = new ArrayList<>(concurrentLoops);
for (int i = 0; i < concurrentLoops; i++) {
final PlainActionFuture<Void> future = PlainActionFuture.newFuture();
futures.add(future);
startSnapshotDeleteLoop(repoName, indexName, "test-snap-" + i, future);
}

Thread.sleep(200);

logger.info("--> delete index");
assertAcked(admin().indices().prepareDelete(indexName));

for (Future<Void> future : futures) {
future.get();
}

logger.info("--> restore snapshot 1");
clusterAdmin().prepareRestoreSnapshot(repoName, firstSnapshotName).get();
ensureGreen(indexName);
}

// create and delete a snapshot of the given name and for the given single index in a loop until the index is removed from the cluster
// at which point doneListener is resolved
private void startSnapshotDeleteLoop(String repoName, String indexName, String snapshotName, ActionListener<Void> doneListener) {
clusterAdmin().prepareCreateSnapshot(repoName, snapshotName)
.setWaitForCompletion(true)
.setPartial(true)
.setIndices(indexName)
.execute(new ActionListener<>() {
@Override
public void onResponse(CreateSnapshotResponse createSnapshotResponse) {
clusterAdmin().prepareDeleteSnapshot(repoName, snapshotName).execute(
ActionTestUtils.assertNoFailureListener(acknowledgedResponse -> {
assertAcked(acknowledgedResponse);
startSnapshotDeleteLoop(repoName, indexName, snapshotName, doneListener);
}));
}

@Override
public void onFailure(Exception e) {
assertThat(e, instanceOf(IndexNotFoundException.class));
doneListener.onResponse(null);
}
});
}


public void testGetReposWithWildcard() {
internalCluster().startMasterOnlyNode();
List<RepositoryMetadata> repositoryMetadata = client().admin().cluster().prepareGetRepositories("*").get().repositories();
Expand Down
6 changes: 5 additions & 1 deletion server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,8 +2210,12 @@ && alreadyReassigned(value.key.getIndexName(), value.key.getId(), reassignedShar
updatedAssignmentsBuilder.put(shardId, updated);
}
}
snapshotEntries.add(entry.withStartedShards(updatedAssignmentsBuilder.build()));
final SnapshotsInProgress.Entry updatedEntry = entry.withShardStates(updatedAssignmentsBuilder.build());
snapshotEntries.add(updatedEntry);
changed = true;
if (updatedEntry.state().completed()) {
Copy link
Member

Choose a reason for hiding this comment

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

sorry if this is a stupid remark but should we do the same thing for the cloning path?

Copy link
Member Author

Choose a reason for hiding this comment

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

No worries :) The clone path isn't affected by this, the logic there is different and always sets the snapshot overall state correctly. Also, there cannot be a concurrent removal of shards for clones anyway :)

Copy link
Member

Choose a reason for hiding this comment

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

🤦🏻 makes sense, thanks!

newFinalizations.add(entry);
}
}
}
} else {
Expand Down