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

prevent NPE due to race between rotation and retention threads #3637

Merged
merged 1 commit into from
Mar 17, 2017
Merged

prevent NPE due to race between rotation and retention threads #3637

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
3 changes: 2 additions & 1 deletion ...a/org/graylog2/indexer/retention/strategies/AbstractIndexCountBasedRetentionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.slf4j.LoggerFactory;

import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -85,7 +86,7 @@ public void retain(IndexSet indexSet) {
private void runRetention(IndexSet indexSet, Map<String, Set<String>> deflectorIndices, int removeCount) {
final Set<String> orderedIndices = Arrays.stream(indexSet.getManagedIndices())
.filter(indexName -> !indices.isReopened(indexName))
.filter(indexName -> !(deflectorIndices.get(indexName).contains(indexSet.getWriteIndexAlias())))
.filter(indexName -> !(deflectorIndices.getOrDefault(indexName, Collections.emptySet()).contains(indexSet.getWriteIndexAlias())))
.sorted((indexName1, indexName2) -> indexSet.extractIndexNumber(indexName2).orElse(0).compareTo(indexSet.extractIndexNumber(indexName1).orElse(0)))
.collect(Collectors.toCollection(LinkedHashSet::new));
orderedIndices
Expand Down