Skip to content

Fix assertion at end of forceRefreshes #37559

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 2 commits into from
Jan 17, 2019
Merged

Fix assertion at end of forceRefreshes #37559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15a218d
Fix assertion at end of forceRefreshes
ywelsch Jan 16, 2019
ee15306
CR: Avoid needlessly instantiating ArrayList
original-brownbear Jan 17, 2019
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
17 changes: 9 additions & 8 deletions server/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,25 @@ public boolean addOrNotify(Translog.Location location, Consumer<Boolean> listene
return true;
}
synchronized (this) {
List<Tuple<Translog.Location, Consumer<Boolean>>> listeners = refreshListeners;
if (listeners == null) {
if (closed) {
throw new IllegalStateException("can't wait for refresh on a closed index");
}
listeners = new ArrayList<>();
refreshListeners = listeners;
if (closed) {
throw new IllegalStateException("can't wait for refresh on a closed index");
}
if (refreshForcers == 0 && listeners.size() < getMaxRefreshListeners.getAsInt()) {
List<Tuple<Translog.Location, Consumer<Boolean>>> listeners = refreshListeners;
final int maxRefreshes = getMaxRefreshListeners.getAsInt();
if (refreshForcers == 0 && maxRefreshes > 0 && (listeners == null || listeners.size() < maxRefreshes)) {
ThreadContext.StoredContext storedContext = threadContext.newStoredContext(true);
Consumer<Boolean> contextPreservingListener = forced -> {
try (ThreadContext.StoredContext ignore = threadContext.stashContext()) {
storedContext.restore();
listener.accept(forced);
}
};
if (listeners == null) {
listeners = new ArrayList<>();
}
// We have a free slot so register the listener
listeners.add(new Tuple<>(location, contextPreservingListener));
refreshListeners = listeners;
return false;
}
}
Expand Down