Skip to content

Fix SnapshotStatus Transport Action Doing IO on Transport Thread (#68023) #68092

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 1 commit into from
Jan 28, 2021
Merged

Fix SnapshotStatus Transport Action Doing IO on Transport Thread (#68023) #68092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStatusApisIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@
import java.util.stream.Collectors;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;

public class SnapshotStatusApisIT extends AbstractSnapshotIntegTestCase {

Expand Down Expand Up @@ -417,6 +419,38 @@ public void testGetSnapshotsRequest() throws Exception {
awaitNoMoreRunningOperations();
}

public void testConcurrentCreateAndStatusAPICalls() throws Exception {
for (int i = 0; i < randomIntBetween(1, 10); i++) {
createIndexWithContent("test-idx-" + i);
}
final String repoName = "test-repo";
createRepository(repoName, "fs");
final int snapshots = randomIntBetween(10, 20);
final List<ActionFuture<SnapshotsStatusResponse>> statuses = new ArrayList<>(snapshots);
final List<ActionFuture<GetSnapshotsResponse>> gets = new ArrayList<>(snapshots);
final Client dataNodeClient = dataNodeClient();
final String[] snapshotNames = createNSnapshots(repoName, snapshots).toArray(Strings.EMPTY_ARRAY);

for (int i = 0; i < snapshots; i++) {
statuses.add(dataNodeClient.admin().cluster().prepareSnapshotStatus(repoName).setSnapshots(snapshotNames).execute());
gets.add(dataNodeClient.admin().cluster().prepareGetSnapshots(repoName).setSnapshots(snapshotNames).execute());
}

for (ActionFuture<SnapshotsStatusResponse> status : statuses) {
assertThat(status.get().getSnapshots(), hasSize(snapshots));
for (SnapshotStatus snapshot : status.get().getSnapshots()) {
assertThat(snapshot.getState(), allOf(not(SnapshotsInProgress.State.FAILED), not(SnapshotsInProgress.State.ABORTED)));
}
}
for (ActionFuture<GetSnapshotsResponse> get : gets) {
final List<SnapshotInfo> snapshotInfos = get.get().getSnapshots();
assertThat(snapshotInfos, hasSize(snapshots));
for (SnapshotInfo snapshotInfo : snapshotInfos) {
assertThat(snapshotInfo.state(), is(SnapshotState.SUCCESS));
}
}
}

private static SnapshotIndexShardStatus stateFirstShard(SnapshotStatus snapshotStatus, String indexName) {
return snapshotStatus.getIndices().get(indexName).getShards().get(0);
}
Expand Down
8 changes: 4 additions & 4 deletions ...g/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.logging.log4j.Logger;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRunnable;
import org.elasticsearch.action.StepListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
Expand All @@ -38,6 +37,7 @@
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.common.util.concurrent.ListenableFuture;
import org.elasticsearch.common.util.set.Sets;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus;
Expand Down Expand Up @@ -237,9 +237,9 @@ private void loadRepositoryData(SnapshotsInProgress snapshotsInProgress, Snapsho
List<SnapshotStatus> builder, Set<String> currentSnapshotNames, String repositoryName,
ActionListener<SnapshotsStatusResponse> listener) {
final Set<String> requestedSnapshotNames = Sets.newHashSet(request.snapshots());
final StepListener<RepositoryData> repositoryDataListener = new StepListener<>();
final ListenableFuture<RepositoryData> repositoryDataListener = new ListenableFuture<>();
repositoriesService.getRepositoryData(repositoryName, repositoryDataListener);
repositoryDataListener.whenComplete(repositoryData -> {
repositoryDataListener.addListener(ActionListener.wrap(repositoryData -> {
final Map<String, SnapshotId> matchedSnapshotIds = repositoryData.getSnapshotIds().stream()
.filter(s -> requestedSnapshotNames.contains(s.getName()))
.collect(Collectors.toMap(SnapshotId::getName, Function.identity()));
Expand Down Expand Up @@ -294,7 +294,7 @@ private void loadRepositoryData(SnapshotsInProgress snapshotsInProgress, Snapsho
}
}
listener.onResponse(new SnapshotsStatusResponse(Collections.unmodifiableList(builder)));
}, listener::onFailure);
}, listener::onFailure), threadPool.generic());
}

/**
Expand Down