Skip to content

Commit 75f6eb7

Browse files
committed
Avoid unneeded refresh with concurrent realtime gets (#47895)
This change should reduce refreshes for a use-case where we perform multiple realtime gets at the same time on an active index. Currently, we only call refresh if the index operation is still on the versionMap. However, at the time we call refresh, that operation might be already or will be included in the latest reader. Hence, we do not need to refresh. Adding another lock here is not an issue as the refresh is already sequential.
1 parent 19cdd0c commit 75f6eb7

File tree

2 files changed

+57
-1
lines changed

2 files changed

+57
-1
lines changed

server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,8 @@ public GetResult get(Get get, BiFunction<String, SearcherScope, Searcher> search
675675
trackTranslogLocation.set(true);
676676
}
677677
}
678-
refresh("realtime_get", SearcherScope.INTERNAL);
678+
assert versionValue.seqNo >= 0 : versionValue;
679+
refreshIfNeeded("realtime_get", versionValue.seqNo);
679680
}
680681
scope = SearcherScope.INTERNAL;
681682
} else {

server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
import java.util.concurrent.BrokenBarrierException;
159159
import java.util.concurrent.CountDownLatch;
160160
import java.util.concurrent.CyclicBarrier;
161+
import java.util.concurrent.Phaser;
161162
import java.util.concurrent.Semaphore;
162163
import java.util.concurrent.TimeUnit;
163164
import java.util.concurrent.atomic.AtomicBoolean;
@@ -5896,4 +5897,58 @@ private void runTestDeleteFailure(
58965897
}
58975898
}
58985899

5900+
public void testRealtimeGetOnlyRefreshIfNeeded() throws Exception {
5901+
final AtomicInteger refreshCount = new AtomicInteger();
5902+
final ReferenceManager.RefreshListener refreshListener = new ReferenceManager.RefreshListener() {
5903+
@Override
5904+
public void beforeRefresh() {
5905+
5906+
}
5907+
5908+
@Override
5909+
public void afterRefresh(boolean didRefresh) {
5910+
if (didRefresh) {
5911+
refreshCount.incrementAndGet();
5912+
}
5913+
}
5914+
};
5915+
try (Store store = createStore()) {
5916+
final EngineConfig config = config(defaultSettings, store, createTempDir(), newMergePolicy(), null,
5917+
refreshListener, null, null, engine.config().getCircuitBreakerService());
5918+
try (InternalEngine engine = createEngine(config)) {
5919+
int numDocs = randomIntBetween(10, 100);
5920+
Set<String> ids = new HashSet<>();
5921+
for (int i = 0; i < numDocs; i++) {
5922+
String id = Integer.toString(i);
5923+
engine.index(indexForDoc(createParsedDoc(id, null)));
5924+
ids.add(id);
5925+
}
5926+
final int refreshCountBeforeGet = refreshCount.get();
5927+
Thread[] getters = new Thread[randomIntBetween(1, 4)];
5928+
Phaser phaser = new Phaser(getters.length + 1);
5929+
for (int t = 0; t < getters.length; t++) {
5930+
getters[t] = new Thread(() -> {
5931+
phaser.arriveAndAwaitAdvance();
5932+
int iters = randomIntBetween(1, 10);
5933+
for (int i = 0; i < iters; i++) {
5934+
ParsedDocument doc = createParsedDoc(randomFrom(ids), null);
5935+
try (Engine.GetResult getResult = engine.get(newGet(true, doc), engine::acquireSearcher)) {
5936+
assertThat(getResult.exists(), equalTo(true));
5937+
assertThat(getResult.docIdAndVersion(), notNullValue());
5938+
}
5939+
}
5940+
});
5941+
getters[t].start();
5942+
}
5943+
phaser.arriveAndAwaitAdvance();
5944+
for (int i = 0; i < numDocs; i++) {
5945+
engine.index(indexForDoc(createParsedDoc("more-" + i, null)));
5946+
}
5947+
for (Thread getter : getters) {
5948+
getter.join();
5949+
}
5950+
assertThat(refreshCount.get(), lessThanOrEqualTo(refreshCountBeforeGet + 1));
5951+
}
5952+
}
5953+
}
58995954
}

0 commit comments

Comments
 (0)