github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-29 01:44:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove needless contention in ContextIndexSearcher.timeoutOverwrites (#123609)

Browse source 
This doesn't have to be an instance variable nor does it need any
concurrency, it's per definition a thread-local variable so lets make it
one.
This commit is contained in:
Armin Braun 2025-02-27 17:50:17 +01:00 • committed by GitHub
parent 17e35d431b
commit 2113a3c606
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View file

@ -36,7 +36,6 @@ import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.BitSetIterator;
import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits;
import org.apache.lucene.util.SparseFixedBitSet; import org.apache.lucene.util.SparseFixedBitSet;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasable;
import org.elasticsearch.lucene.util.CombinedBitSet; import org.elasticsearch.lucene.util.CombinedBitSet;
import org.elasticsearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.dfs.AggregatedDfs;
@ -53,7 +52,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.PriorityQueue; import java.util.PriorityQueue;
import java.util.Set;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -82,7 +80,6 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
// don't create slices with less than this number of docs // don't create slices with less than this number of docs
private final int minimumDocsPerSlice; private final int minimumDocsPerSlice;
private final Set<Thread> timeoutOverwrites = ConcurrentCollections.newConcurrentSet();
private volatile boolean timeExceeded = false; private volatile boolean timeExceeded = false;
/** constructor for non-concurrent search */ /** constructor for non-concurrent search */
@ -374,6 +371,8 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
} }
} }
private static final ThreadLocal<Boolean> timeoutOverwrites = ThreadLocal.withInitial(() -> false);
/** /**
* Similar to the lucene implementation, with the following changes made: * Similar to the lucene implementation, with the following changes made:
* 1) postCollection is performed after each segment is collected. This is needed for aggregations, performed by search threads * 1) postCollection is performed after each segment is collected. This is needed for aggregations, performed by search threads
@ -397,12 +396,12 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
try { try {
// Search phase has finished, no longer need to check for timeout // Search phase has finished, no longer need to check for timeout
// otherwise the aggregation post-collection phase might get cancelled. // otherwise the aggregation post-collection phase might get cancelled.
boolean added = timeoutOverwrites.add(Thread.currentThread()); assert timeoutOverwrites.get() == false;
assert added; timeoutOverwrites.set(true);
doAggregationPostCollection(collector); doAggregationPostCollection(collector);
} finally { } finally {
boolean removed = timeoutOverwrites.remove(Thread.currentThread()); assert timeoutOverwrites.get();
assert removed; timeoutOverwrites.set(false);
} }
} }
} }
@ -420,7 +419,7 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
} }
public void throwTimeExceededException() { public void throwTimeExceededException() {
if (timeoutOverwrites.contains(Thread.currentThread()) == false) { if (timeoutOverwrites.get() == false) {
throw new TimeExceededException(); throw new TimeExceededException();
} }
} }