Author: chetanm Date: Thu Oct 26 04:27:58 2017 New Revision: 1813364 URL: http://svn.apache.org/viewvc?rev=1813364&view=rev Log: OAK-6635 - IndexReader closed exception in DocumentQueue
Merging 1809289 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/IndexNodeManager.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 04:27:58 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,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,1811655,1813192 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java?rev=1813364&r1=1813363&r2=1813364&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java (original) +++ jackrabbit/oak/branches/1.6/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java Thu Oct 26 04:27:58 2017 @@ -22,6 +22,7 @@ import static com.google.common.base.Pre import java.io.IOException; import java.util.Collections; import java.util.List; +import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReadWriteLock; @@ -93,10 +94,18 @@ public class IndexNodeManager { private final ReaderRefreshPolicy refreshPolicy; + private final Semaphore refreshLock = new Semaphore(1); + private final Runnable refreshCallback = new Runnable() { @Override public void run() { - refreshReaders(); + if (refreshLock.tryAcquire()) { + try { + refreshReaders(); + }finally { + refreshLock.release(); + } + } } }; @@ -141,7 +150,14 @@ public class IndexNodeManager { boolean success = false; try { refreshPolicy.refreshOnReadIfRequired(refreshCallback); - IndexNode indexNode = new IndexNodeImpl(searcherHolder); + SearcherHolder local = searcherHolder; + int tryCount = 0; + while (!local.searcher.getIndexReader().tryIncRef()) { + checkState(++tryCount < 10, "Not able to " + + "get open searcher in %s attempts", tryCount); + local = searcherHolder; + } + IndexNode indexNode = new IndexNodeImpl(local); success = true; return indexNode; } finally { @@ -245,10 +261,6 @@ public class IndexNodeManager { decrementSearcherUsageCount(holder.searcher); } - private static void incrementSearcherUsageCount(IndexSearcher searcher) { - searcher.getIndexReader().incRef(); - } - private void decrementSearcherUsageCount(IndexSearcher searcher) { try { //Decrement the count by 1 as we increased it while creating the searcher @@ -276,8 +288,6 @@ public class IndexNodeManager { private IndexNodeImpl(SearcherHolder searcherHolder) { this.holder = searcherHolder; - //Increment on each acquire - incrementSearcherUsageCount(holder.searcher); } @Override 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=1813364&r1=1813363&r2=1813364&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 04:27:58 2017 @@ -45,7 +45,6 @@ import org.apache.jackrabbit.oak.stats.S import org.apache.lucene.document.Document; import org.apache.lucene.search.MatchAllDocsQuery; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -64,7 +63,7 @@ public class ReaderRefCountIT { private NodeState root = INITIAL_CONTENT; private IndexCopier indexCopier; - private int runTimeInSecs = 60; + private int runTimeInSecs = 50; private int noOfThread = 5; @Before @@ -72,7 +71,6 @@ public class ReaderRefCountIT { indexCopier = new IndexCopier(sameThreadExecutor(), temporaryFolder.getRoot()); } - @Ignore("OAK-6635") @Test public void syncIndex() throws Exception{ IndexDefinitionBuilder idx = new IndexDefinitionBuilder(); @@ -83,7 +81,6 @@ public class ReaderRefCountIT { runMultiReaderScenario(idx, nrtFactory); } - @Ignore("OAK-6635") @Test public void nrtIndex() throws Exception{ IndexDefinitionBuilder idx = new IndexDefinitionBuilder(); @@ -176,6 +173,8 @@ public class ReaderRefCountIT { t.join(); } + nrtFactory.close(); + if (!exceptionList.isEmpty()) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw);