Skip to content

Avoid blocking can_match phase on FrozenEngine #69379

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

Merged
ywelsch merged 1 commit into from
Feb 23, 2021
Merged

Avoid blocking can_match phase on FrozenEngine #69379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions ...rTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import com.carrotsearch.hppc.cursors.ObjectCursor;
import org.apache.lucene.search.TotalHits;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
Expand Down Expand Up @@ -117,7 +116,6 @@
import static org.hamcrest.Matchers.oneOf;
import static org.hamcrest.Matchers.sameInstance;

@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/69336")
public class SearchableSnapshotsIntegTests extends BaseSearchableSnapshotsIntegTestCase {

public void testCreateAndRestoreSearchableSnapshot() throws Exception {
Expand Down