Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7587: Move the call to seed version buckets to before buffering updates during core construction 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1682016 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2015-05-27 13:29:32 +00:00
parent 60298db833
commit 544bb51afe
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -363,6 +363,11 @@ Bug Fixes
* SOLR-7585: Fix NoSuchElementException in LFUCache resulting from heavy writes
making concurrent put() calls. (Maciej Zasada via Shawn Heisey)
* SOLR-7587: Seeding bucket versions from index when the firstSearcher event fires has a race condition
that leads to an infinite wait on VersionInfo's ReentrantReadWriteLock because the read-lock acquired
during a commit cannot be upgraded to a write-lock needed to block updates; solution is to move the
call out of the firstSearcher event path and into the SolrCore constructor. (Timothy Potter)
Optimizations
----------------------

13
solr/core/src/java/org/apache/solr/core/SolrCore.java
View File

@ -841,6 +841,9 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
}
}
// seed version buckets with max from index during core initialization ... requires a searcher!
seedVersionBucketsWithMaxFromIndex();
bufferUpdatesIfConstructing(coreDescriptor);
// For debugging
@ -849,16 +852,20 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
this.ruleExpiryLock = new ReentrantLock();
registerConfListener();
}
// seed version buckets with max from index during core initialization
if (this.updateHandler != null && this.updateHandler.getUpdateLog() != null) {
private void seedVersionBucketsWithMaxFromIndex() {
UpdateHandler uh = getUpdateHandler();
if (uh != null && uh.getUpdateLog() != null) {
RefCounted<SolrIndexSearcher> newestSearcher = getRealtimeSearcher();
if (newestSearcher != null) {
try {
this.updateHandler.getUpdateLog().onFirstSearcher(newestSearcher.get());
uh.getUpdateLog().onFirstSearcher(newestSearcher.get());
} finally {
newestSearcher.decref();
}
} else {
log.warn("No searcher available! Cannot seed version buckets with max from index.");
}
}
}