[5.x] Fix search index race condition #10695
Merged
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.
This PR solves a race condition when reading and writing a Comb-driven search index.
It's possible that one request will try to read the JSON file when another is writing to it, causing the JSON parsing to return invalid JSON.
Invalid JSON would return null. Passing null to
collect()
would be an empty collection. If this happened when you are trying to insert something into the index, it would result in that index only containing the inserted data.This is solved by throwing an exception when encountering invalid JSON. This would prevent the search index being emptied out but of course now results in an exception.
Additionally, file locks are now used when reading and writing those files to prevent getting into that situation where the exception would be thrown to begin with.