[Backport 2.x] [Bugfix] Fixes IRC NPE bug for timed-out cacheable queries (#15327) #15390
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.
Backports #15327 to 2.x.
Description
When a cacheable query times out, the IRC lets it enter the cache and then invalidates it in the same search thread. In 2.13, invalidation was changed to require a readerCacheKeyId string.
invalidate()
only got this if theDirectoryReader
was anOpenSearchDirectoryReader
and otherwise it was left null. When the reader was anExitableDirectoryReader
, this caused an NPE, which was returned to the user. It also means the timed-out query response incorrectly remained in the cache and could be returned the next time the user made the query.Fix this by getting
readerCacheKeyId
fromreader.getReaderCacheHelper()
without checking which classreader
is. This is safe, as it's the same method used inIndicesRequestCache.getOrCompute()
. Now the user correctly sees the timed-out response and it is invalidated from the cache.Tested in an IT and manually with the java debugger.
Related Issues
Resolves #15175
Check List
- [N/A] API changes companion pull request created, if applicable.- [N/A] Public documentation issue/PR created, if applicable.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.