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

Jump to bottom

Assert aborted snapshots have no pending shard work #102621

Merged
merged 5 commits into from
Nov 27, 2023
Merged

Assert aborted snapshots have no pending shard work #102621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0004536
Assert aborted snapshots have no pending shard work
DaveCTurner Nov 26, 2023
285b4a9
Fix test creating invalid values
DaveCTurner Nov 27, 2023
9124802
Merge branch 'main' into 2023/11/26/assert-no-pending-work-in-aborted…
DaveCTurner Nov 27, 2023
99772db
Remove ternary
DaveCTurner Nov 27, 2023
e2e660d
Remove TODO
DaveCTurner Nov 27, 2023
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
8 changes: 7 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,20 @@ private static boolean assertConsistentEntries(Map<String, ByRepo> entries) {
assert entry.repository().equals(repository) : "mismatched repository " + entry + " tracked under " + repository;
for (Map.Entry<RepositoryShardId, ShardSnapshotStatus> shard : entry.shardsByRepoShardId().entrySet()) {
final RepositoryShardId sid = shard.getKey();
final ShardSnapshotStatus shardSnapshotStatus = shard.getValue();
assert assertShardStateConsistent(
entriesForRepository,
assignedShards,
queuedShards,
sid.indexName(),
sid.shardId(),
shard.getValue()
shardSnapshotStatus
);

assert entry.state() != State.ABORTED
|| shardSnapshotStatus.state == ShardState.ABORTED
|| shardSnapshotStatus.state().completed()
: sid + " is in state " + shardSnapshotStatus.state() + " in aborted snapshot " + entry.snapshot;
}
}
// make sure in-flight-shard-states can be built cleanly for the entries without tripping assertions
Expand Down
13 changes: 10 additions & 3 deletions server/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,15 @@ public void testXContent() throws IOException {
}

public static State randomState(Map<ShardId, SnapshotsInProgress.ShardSnapshotStatus> shards) {
return SnapshotsInProgress.completed(shards.values())
? randomFrom(State.SUCCESS, State.FAILED)
: randomFrom(State.STARTED, State.INIT, State.ABORTED);
if (SnapshotsInProgress.completed(shards.values())) {
return randomFrom(State.SUCCESS, State.FAILED);
}
if (shards.values()
.stream()
.map(SnapshotsInProgress.ShardSnapshotStatus::state)
.allMatch(st -> st.completed() || st == ShardState.ABORTED)) {
return State.ABORTED;
}
return randomFrom(State.STARTED, State.INIT);
}
}