Skip to content

Combine per-repo results in get-snapshots action #111004

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
Jul 18, 2024
Merged

Combine per-repo results in get-snapshots action #111004

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
30 changes: 5 additions & 25 deletions ...ava/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,12 @@
import org.elasticsearch.transport.TransportService;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiPredicate;
Expand Down Expand Up @@ -182,19 +180,13 @@ private class GetSnapshotsOperation {
private final GetSnapshotInfoExecutor getSnapshotInfoExecutor;

// results
private final Queue<List<SnapshotInfo>> allSnapshotInfos = ConcurrentCollections.newQueue();
private final List<SnapshotInfo> allSnapshotInfos = Collections.synchronizedList(new ArrayList<>());

/**
* Accumulates number of snapshots that match the name/fromSortValue/slmPolicy predicates, to be returned in the response.
*/
private final AtomicInteger totalCount = new AtomicInteger();

/**
* Accumulates the number of snapshots that match the name/fromSortValue/slmPolicy/after predicates, for sizing the final result
* list.
*/
private final AtomicInteger resultsCount = new AtomicInteger();

GetSnapshotsOperation(
CancellableTask cancellableTask,
List<RepositoryMetadata> repositories,
Expand Down Expand Up @@ -454,18 +446,7 @@ private void loadSnapshotInfos(Iterator<AsyncSnapshotInfo> asyncSnapshotInfoIter
if (cancellableTask.notifyIfCancelled(listener)) {
return;
}
final var repositoryTotalCount = new AtomicInteger();

final List<SnapshotInfo> snapshots = new ArrayList<>();
final List<SnapshotInfo> syncSnapshots = Collections.synchronizedList(snapshots);

try (var listeners = new RefCountingListener(listener)) {
final var iterationCompleteListener = listeners.acquire(ignored -> {
totalCount.addAndGet(repositoryTotalCount.get());
// no need to synchronize access to snapshots: all writes happen-before this read
resultsCount.addAndGet(snapshots.size());
allSnapshotInfos.add(snapshots);
});
ThrottledIterator.run(
Iterators.failFast(asyncSnapshotInfoIterator, () -> cancellableTask.isCancelled() || listeners.isFailing()),
(ref, asyncSnapshotInfo) -> {
Expand All @@ -474,9 +455,9 @@ private void loadSnapshotInfos(Iterator<AsyncSnapshotInfo> asyncSnapshotInfoIter
@Override
public void onResponse(SnapshotInfo snapshotInfo) {
if (matchesPredicates(snapshotInfo)) {
repositoryTotalCount.incrementAndGet();
totalCount.incrementAndGet();
if (afterPredicate.test(snapshotInfo)) {
syncSnapshots.add(snapshotInfo.maybeWithoutIndices(indices));
allSnapshotInfos.add(snapshotInfo.maybeWithoutIndices(indices));
}
}
refListener.onResponse(null);
Expand All @@ -495,7 +476,7 @@ public void onFailure(Exception e) {
},
getSnapshotInfoExecutor.getMaxRunningTasks(),
() -> {},
() -> iterationCompleteListener.onResponse(null)
() -> {}
);
}
}
Expand All @@ -505,12 +486,11 @@ private GetSnapshotsResponse buildResponse() {
cancellableTask.ensureNotCancelled();
int remaining = 0;
final var resultsStream = allSnapshotInfos.stream()
.flatMap(Collection::stream)
.peek(this::assertSatisfiesAllPredicates)
.sorted(sortBy.getSnapshotInfoComparator(order))
.skip(offset);
final List<SnapshotInfo> snapshotInfos;
if (size == GetSnapshotsRequest.NO_LIMIT || resultsCount.get() <= size) {
if (size == GetSnapshotsRequest.NO_LIMIT || allSnapshotInfos.size() <= size) {
snapshotInfos = resultsStream.toList();
} else {
snapshotInfos = new ArrayList<>(size);
Expand Down