You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/10/26 05:08:29 UTC
svn commit: r1813366 - in /jackrabbit/oak/branches/1.6: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/
Author: chetanm
Date: Thu Oct 26 05:08:29 2017
New Revision: 1813366
URL: http://svn.apache.org/viewvc?rev=1813366&view=rev
Log:
OAK-6777 - IndexReader closed exception in previous reader
Merging 1811155 i.e. the actual fix
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 26 05:08:29 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,1806668,1807308
,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1811071-1811072,1811655,1813192
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1805851-1805852,1806668,1807308
,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1811071-1811072,1811155,1811655,1813192
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java?rev=1813366&r1=1813365&r2=1813366&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java Thu Oct 26 05:08:29 2017
@@ -84,7 +84,9 @@ public class NRTIndex implements Closeab
private File indexDir;
private Directory directory;
private DirectoryReader dirReader;
+ private DirectoryReader dirReaderUsedForPrevious;
private boolean closed;
+ private boolean previousModeEnabled;
private List<LuceneIndexReader> readers;
private final List<IndexReader> openedReaders;
private final boolean assertAllReadersClosed;
@@ -108,12 +110,19 @@ public class NRTIndex implements Closeab
this.openTime = statisticsProvider.getTimer(metricName("OPEN_TIME"), StatsOptions.METRICS_ONLY).time();
}
+ /**
+ * Note that this method is called from a different NRTIndex instance getReaders
+ * call. So "dirReader" instance changed here is different
+ */
@CheckForNull
private LuceneIndexReader getPrimaryReader() {
- DirectoryReader latestReader = createReader();
- if (latestReader != dirReader) {
- decrementReaderUseCount(dirReader);
- dirReader = latestReader;
+ DirectoryReader latestReader = createReader(dirReaderUsedForPrevious);
+ while (latestReader != null && !latestReader.tryIncRef()) {
+ latestReader = createReader(dirReaderUsedForPrevious);
+ }
+ if (latestReader != dirReaderUsedForPrevious) {
+ decrementReaderUseCount(dirReaderUsedForPrevious);
+ dirReaderUsedForPrevious = latestReader;
}
return latestReader != null ? new NRTReader(latestReader, directory) : null;
}
@@ -133,12 +142,14 @@ public class NRTIndex implements Closeab
*/
public synchronized List<LuceneIndexReader> getReaders() {
checkState(!closed);
- DirectoryReader latestReader = createReader();
+ checkState(!previousModeEnabled);
+ DirectoryReader latestReader = createReader(dirReader);
//reader not changed i.e. no change in index
//reuse old readers
if (latestReader == dirReader && readers != null){
return readers;
}
+
List<LuceneIndexReader> newReaders = Lists.newArrayListWithCapacity(2);
if (latestReader != null) {
newReaders.add(new NRTReader(latestReader, directory));
@@ -150,7 +161,7 @@ public class NRTIndex implements Closeab
newReaders.add(previousReader);
}
- decrementReaderUseCount(dirReader);
+ decrementReaderUseCount(readers);
dirReader = latestReader;
readers = ImmutableList.copyOf(newReaders);
@@ -161,16 +172,30 @@ public class NRTIndex implements Closeab
return refreshPolicy;
}
- public synchronized void close() throws IOException {
+ /**
+ * Disconnects the previous reader used by this NRTIndex. Note that this would be
+ * different from 'dirReaderUsedForPrevious' which is meant to be used by newer NRTIndex
+ * which refers to this NRTIndex as previous
+ */
+ public void disconnectPrevious(){
+ decrementReaderUseCount(readers);
+ readers = Collections.emptyList();
+
+ //From now onwards no caller should be invoked getReaders
+ //only call for getPrimaryReader would be allowed
+ previousModeEnabled = true;
+ }
+
+ public void close() throws IOException {
if (closed) {
return;
}
log.debug("[{}] Closing NRTIndex [{}]", definition.getIndexPath(), getName());
- if (dirReader != null){
- dirReader.close();
- }
+ decrementReaderUseCount(dirReaderUsedForPrevious);
+ //'readers' already has dirReader so no need to close it explicitly
+ decrementReaderUseCount(readers);
assertAllReadersAreClosed();
@@ -223,6 +248,14 @@ public class NRTIndex implements Closeab
}
}
+ private void decrementReaderUseCount(@Nullable List<LuceneIndexReader> readers) {
+ if (readers != null) {
+ for (LuceneIndexReader r : readers) {
+ decrementReaderUseCount(r.getReader());
+ }
+ }
+ }
+
private void decrementReaderUseCount(IndexReader reader) {
try {
if (reader != null) {
@@ -239,7 +272,7 @@ public class NRTIndex implements Closeab
* existing reader would be returned
*/
@CheckForNull
- private synchronized DirectoryReader createReader() {
+ private synchronized DirectoryReader createReader(DirectoryReader dirReader) {
checkState(!closed);
//Its possible that readers are obtained
//before anything gets indexed
@@ -251,7 +284,7 @@ public class NRTIndex implements Closeab
TimerStats.Context ctx = refreshTimer.time();
//applyDeletes is false as layers above would take care of
//stale result
- if (dirReader == null) {
+ if (dirReader == null || dirReader.getRefCount() == 0) {
result = DirectoryReader.open(indexWriter, false);
} else {
DirectoryReader newReader = DirectoryReader.openIfChanged(dirReader, indexWriter, false);
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java?rev=1813366&r1=1813365&r2=1813366&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java Thu Oct 26 05:08:29 2017
@@ -89,8 +89,13 @@ public class NRTIndexFactory implements
@Override
public void close() throws IOException {
- for (NRTIndex index : indexes.values()){
- index.close();
+ for (String indexPath : indexes.keySet()) {
+ //Close backwards i.e. newest NRTIndex first and then older
+ //as newer refers to previous NRTIndex readers
+ List<NRTIndex> nrtIndexes = indexes.get(indexPath);
+ for (int i = nrtIndexes.size() -1 ; i >= 0 ; i--) {
+ nrtIndexes.get(i).close();
+ }
}
indexes.clear();
}
@@ -117,6 +122,10 @@ public class NRTIndexFactory implements
return;
}
NRTIndex oldest = existing.remove(0);
+
+ //Disconnect the 'oldest' from NRTIndex which refers to that
+ //i.e. the next entry in existing
+ existing.get(0).disconnectPrevious();
try {
oldest.close();
} catch (IOException e) {
Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java?rev=1813366&r1=1813365&r2=1813366&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java (original)
+++ jackrabbit/oak/branches/1.6/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ReaderRefCountIT.java Thu Oct 26 05:08:29 2017
@@ -99,7 +99,6 @@ public class ReaderRefCountIT {
* This causes the IndexNodeManager to switch to newer indexes
* and hence lead to creation and closing of older NRTIndexes
*/
- @Ignore("OAK-6777")
@Test
public void indexTrackerUpdatesAndNRT() throws Exception{
IndexDefinitionBuilder idx = new IndexDefinitionBuilder();