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

shouldRollGeneration should execute under read lock #41696

Merged
merged 4 commits into from
May 10, 2019
+3 −2
Merged

shouldRollGeneration should execute under read lock #41696

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
659f25b
shouldRollGeneration should execute under read lock
dnhatn Apr 30, 2019
1c2d999
Merge branch 'master' into should-rolll-under-lock
dnhatn Apr 30, 2019
df5c02b
Merge branch 'master' into should-rolll-under-lock
dnhatn May 9, 2019
8e634d8
Merge branch 'master' into should-rolll-under-lock
dnhatn May 10, 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
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/index/translog/Translog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,9 +561,10 @@ public Location add(final Operation operation) throws IOException {
* @return {@code true} if the current generation should be rolled to a new generation
*/
public boolean shouldRollGeneration() {
final long size = this.current.sizeInBytes();
final long threshold = this.indexSettings.getGenerationThresholdSize().getBytes();
return size > threshold;
try (ReleasableLock ignored = readLock.acquire()) {
return this.current.sizeInBytes() > threshold;
}
}

/**
Expand Down