Fix indexing race conditions for new dataset versions#12388
Open
vera wants to merge 5 commits into
Open
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
What this PR does / why we need it:
This PR fixes a race condition where a new dataset version (draft) could be sent to the indexing service before its database ID (
datasetVersionId) was committed (see #12377). The fix ensures a database flush before indexing and adds defensive handling in the search results and indexing logic.Which issue(s) this PR closes:
Special notes for your reviewer:
The main fix is in
CreateDatasetVersionCommand.javawherectxt.em().flush()is called before returning (and thus beforeonSuccesstriggers indexing). Changes inSolrSearchResult.javaandIndexServiceBean.javaare defensive to prevent 500 errors if the ID is still missing for any reason.Suggestions on how to test this:
Since this is a race condition, it is hard to reproduce consistently in a standard integration test.
Existing integration & unit tests can be run to ensure nothing was broken in dataset creation and indexing.
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
/
Is there a release notes update needed for this change?:
Yes, included in
doc/release-notes/12377-fix-dataset-version-id-race-condition.md.Additional documentation:
/