Fix slowness in SearchableSnapshotsIntegTests

elastic · Feb 23, 2021 · 3e5b9f0 · 3e5b9f0
1 parent e243e4d
commit 3e5b9f0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java
@@ -173,9 +173,10 @@ private synchronized ElasticsearchDirectoryReader getOrOpenReader() throws IOExc
     }
 
     @SuppressForbidden(reason = "we manage references explicitly here")
-    private synchronized ElasticsearchDirectoryReader getReader() {
-        if (lastOpenedReader != null && lastOpenedReader.tryIncRef()) {
-            return lastOpenedReader;
+    private ElasticsearchDirectoryReader getReader() {
+        final ElasticsearchDirectoryReader readerRef = lastOpenedReader; // volatile read
+        if (readerRef != null && readerRef.tryIncRef()) {
+            return readerRef;
         }
         return null;
     }