honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try if tombstone is eligable for pruning before locking on it's key (#28767) 

Pruning tombstones is quite expensive since we have to walk though all
deletes in the live version map and acquire a lock on every value even though
it's impossible to prune it. This change does a pre-check if a delete is old enough
and if not it skips acquireing the lock.
This commit is contained in:
Simon Willnauer 2018-03-04 11:31:13 -08:00 committed by GitHub
parent f53d159aa1
commit 5a1d9f33a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java
View File

@ -375,25 +375,31 @@ final class LiveVersionMap implements ReferenceManager.RefreshListener, Accounta
} }
} }
private boolean canRemoveTombstone(long currentTime, long pruneInterval, DeleteVersionValue versionValue) {
// check if the value is old enough to be removed
final boolean isTooOld = currentTime - versionValue.time > pruneInterval;
// version value can't be removed it's
// not yet flushed to lucene ie. it's part of this current maps object
final boolean isNotTrackedByCurrentMaps = versionValue.time < maps.getMinDeleteTimestamp();
return isTooOld && isNotTrackedByCurrentMaps;
}
void pruneTombstones(long currentTime, long pruneInterval) { void pruneTombstones(long currentTime, long pruneInterval) {
for (Map.Entry<BytesRef, DeleteVersionValue> entry : tombstones.entrySet()) { for (Map.Entry<BytesRef, DeleteVersionValue> entry : tombstones.entrySet()) {
final BytesRef uid = entry.getKey(); // we do check before we actually lock the key - this way we don't need to acquire the lock for tombstones that are not
try (Releasable lock = keyedLock.tryAcquire(uid)) { // prune-able. If the tombstone changes concurrently we will re-read and step out below since if we can't collect it now w
// we use tryAcquire here since this is a best effort and we try to be least disruptive // we won't collect the tombstone below since it must be newer than this one.
// this method is also called under lock in the engine under certain situations such that this can lead to deadlocks if (canRemoveTombstone(currentTime, pruneInterval, entry.getValue())) {
// if we do use a blocking acquire. see #28714 final BytesRef uid = entry.getKey();
if (lock != null) { // did we get the lock? try (Releasable lock = keyedLock.tryAcquire(uid)) {
// can we do it without this lock on each value? maybe batch to a set and get the lock once per set? // we use tryAcquire here since this is a best effort and we try to be least disruptive
// Must re-get it here, vs using entry.getValue(), in case the uid was indexed/deleted since we pulled the iterator: // this method is also called under lock in the engine under certain situations such that this can lead to deadlocks
final DeleteVersionValue versionValue = tombstones.get(uid); // if we do use a blocking acquire. see #28714
if (versionValue != null) { if (lock != null) { // did we get the lock?
// check if the value is old enough to be removed // Must re-get it here, vs using entry.getValue(), in case the uid was indexed/deleted since we pulled the iterator:
final boolean isTooOld = currentTime - versionValue.time > pruneInterval; final DeleteVersionValue versionValue = tombstones.get(uid);
if (isTooOld) { if (versionValue != null) {
// version value can't be removed it's if (canRemoveTombstone(currentTime, pruneInterval, versionValue)) {
// not yet flushed to lucene ie. it's part of this current maps object
final boolean isNotTrackedByCurrentMaps = versionValue.time < maps.getMinDeleteTimestamp();
if (isNotTrackedByCurrentMaps) {
removeTombstoneUnderLock(uid); removeTombstoneUnderLock(uid);
} }
} }