Fix race condition during tenant initialization by adding synchronization lock and aborted connection rollback #4407
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
![wso2-engineering[bot]](https://avatars.githubusercontent.com/in/1856828?s=60&v=4){kind=small}
| * @param path the path that caused the constraint violation | ||
| * @return the existing path ID if found, or -1 if not found | ||
| */ | ||
| private int getPathIDAfterRollback(AbstractConnection conn, String path) throws SQLException { |
There was a problem hiding this comment.
Log Improvement Suggestion No: 1
Suggested change
| private int getPathIDAfterRollback(AbstractConnection conn, String path) throws SQLException { | |
| private int getPathIDAfterRollback(AbstractConnection conn, String path) throws SQLException { | |
| if (log.isDebugEnabled()) { | |
| log.debug("Attempting to retrieve path ID after rollback for path: " + path); | |
| } |
...carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/dao/JDBCPathCache.java
Show resolved
Hide resolved
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
There was a problem hiding this comment.
AI Agent Log Improvement Checklist
- The log-related comments and suggestions in this review were generated by an AI tool to assist with identifying potential improvements. Purpose of reviewing the code for log improvements is to improve the troubleshooting capabilities of our products.
- Please make sure to manually review and validate all suggestions before applying any changes. Not every code suggestion would make sense or add value to our purpose. Therefore, you have the freedom to decide which of the suggestions are helpful.
✅ Before merging this pull request:
- Review all AI-generated comments for accuracy and relevance.
- Complete and verify the table below. We need your feedback to measure the accuracy of these suggestions and the value they add. If you are rejecting a certain code suggestion, please mention the reason briefly in the suggestion for us to capture it.
There was a problem hiding this comment.
Pull Request Overview
This PR addresses race conditions during tenant initialization and improves database error handling for constraint violations. The changes focus on adding synchronization mechanisms and better transaction rollback handling to ensure robust concurrent operations.
- Added tenant-specific synchronization locking to prevent race conditions during tenant initialization
- Enhanced database error handling with proper transaction rollback for constraint violations
- Improved error recovery by introducing a dedicated method for handling aborted transactions
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| RegistryUtils.java | Added tenant-specific locking mechanism with getTenantInitializationLock method and synchronized initializeTenant method |
| JDBCPathCache.java | Enhanced constraint violation handling with getPathIDAfterRollback method and updated both addEntry methods to use it |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
...o2.carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/utils/RegistryUtils.java
Show resolved
Hide resolved
...carbon.registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/dao/JDBCPathCache.java
Show resolved
Hide resolved
Author
|
integration tests run in the fork |
|
PR builder started |
|
PR builder completed |
jenkins-is-staging
approved these changes
Oct 9, 2025
jenkins-is-staging
left a comment
jenkins-is-staging
left a comment
There was a problem hiding this comment.
Approving the pull request based on the successful pr build https://github.com/wso2/product-is/actions/runs/18375345415
nilasini
approved these changes
Oct 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Purpose
This pull request introduces improvements to concurrency handling and error recovery in the registry codebase. The main changes focus on preventing race conditions during tenant initialization and ensuring robust handling of database constraint violations when adding paths.
Concurrency and synchronization improvements:
RegistryUtils.javato prevent race conditions during tenant initialization by synchronizing on a per-tenant lock object. (initializeTenant,getTenantInitializationLock)Database error handling enhancements:
JDBCPathCache.javaby introducinggetPathIDAfterRollback, which rolls back aborted transactions and retries path ID lookup after a failed insert due to a duplicate path. This change is applied in both overloadedaddEntrymethods.Related issue
<path>Referential integrity constraint violation:REG_RESOURCE_FK_BY_PATH_IDproduct-is#25649