Incorporate fixes and cleanups for Solr 7 #27
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The original browse code worked on a model of each BrowseSource having persistent handles open to the Headings & Auth DBs, and these were reopened if needed at the point of handling a request. This doesn't fit terribly well with the Solr API's way of doing things, where searchers are refcounted and you're expected to return them when done. The handler code was mistakenly decrementing the refcount for the AuthDB searcher but then continuing to use it, which causes problems when Solr closes the underlying searcher. This commit changes the request handler to make Browse objects ephemeral: just get the searcher we need, use them to handle the request, and return them. Let Solr handle managing searcher lifetimes.
|
Thanks, @marktriggs -- I've created a release-4.1 branch in the repository so that I can get these fixes in place for VuFind 4.1.3 (which still uses Solr 6), and then I have also merged that branch into master (so I can also build a Solr 7-compatible version). Thus, this work is all merged in now! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi there,
I've included three changes here:
Some style cleanups--mainly just continuing Tod's good work.
The fix to ensure that we don't continue using IndexSearcher objects after they've been handed back to Solr.
Simplified lock handling for the HeadingsDB. As I was cleaning up its exception handling, I found it easy to inadvertently introduce deadlocks due to the way I'd originally set up its lock handling. I've replaced that with a much simpler scheme and tested with multiple concurrent users.