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

Ensure LuceneChangesSnapshot close once

This commit is contained in:
Nhat Nguyen 2018-07-13 16:39:58 -04:00
parent b1f5d361b3
commit 08c2f551c0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/main/java/org/elasticsearch/index/engine/LuceneChangesSnapshot.java
View File

@ -34,6 +34,7 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.ArrayUtil;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.index.VersionType; import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.fieldvisitor.FieldsVisitor; import org.elasticsearch.index.fieldvisitor.FieldsVisitor;
import org.elasticsearch.index.mapper.IdFieldMapper; import org.elasticsearch.index.mapper.IdFieldMapper;
@ -49,6 +50,7 @@ import java.io.IOException;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
/** /**
* A {@link Translog.Snapshot} from changes in a Lucene index * A {@link Translog.Snapshot} from changes in a Lucene index
@ -88,6 +90,12 @@ final class LuceneChangesSnapshot implements Translog.Snapshot {
if (searchBatchSize < 0) { if (searchBatchSize < 0) {
throw new IllegalArgumentException("Search_batch_size must not be negative [" + searchBatchSize + "]"); throw new IllegalArgumentException("Search_batch_size must not be negative [" + searchBatchSize + "]");
} }
final AtomicBoolean closed = new AtomicBoolean();
this.onClose = () -> {
if (closed.compareAndSet(false, true)) {
IOUtils.close(engineSearcher);
}
};
this.mapperService = mapperService; this.mapperService = mapperService;
this.searchBatchSize = searchBatchSize; this.searchBatchSize = searchBatchSize;
this.fromSeqNo = fromSeqNo; this.fromSeqNo = fromSeqNo;
@ -98,10 +106,8 @@ final class LuceneChangesSnapshot implements Translog.Snapshot {
this.indexSearcher.setQueryCache(null); this.indexSearcher.setQueryCache(null);
this.parallelArray = new ParallelArray(searchBatchSize); this.parallelArray = new ParallelArray(searchBatchSize);
final TopDocs topDocs = searchOperations(null); final TopDocs topDocs = searchOperations(null);
this.totalHits = Math.toIntExact(topDocs.totalHits); this.totalHits = Math.toIntExact(topDocs.totalHits);
this.scoreDocs = topDocs.scoreDocs; this.scoreDocs = topDocs.scoreDocs;
this.onClose = engineSearcher;
fillParallelArray(scoreDocs, parallelArray); fillParallelArray(scoreDocs, parallelArray);
} }