Conversation
Steve-Mcl
approved these changes
Aug 8, 2024
Contributor
Steve-Mcl
left a comment
There was a problem hiding this comment.
I have gone over this with a fine tooth comb. Apart from line 153 where the transaction is not included in the call to this.quota, the idea is sound.
While not including the transaction object may typically not cause any issues I have witnessed this in other places of the code with sequelize where the active transaction was not included in a query caused issues.
As for the introduction in-mem marshalling the code looks good and should contain the issue at hand. In particular I note the unlock call is in a finally block with all of the "locking" code contained within the try block.
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
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.
Fixes #122
As described in the linked issue, a deadlock is possible if we get parallel update requests for different scopes under the same instance.
A full fix would require adding a new table to the database against which we obtain the lock for the instance (rather then the existing instance/scope level lock).
I've chosen a more pragmatic solution to get this fixed quickly; rather than make db changes, this uses an in-memory mutex that marshals access to the instance.
This isn't a scalable solution as the locks are held in memory of the app (so no horizontal scaling possible); but it will work within our current usage.
I've also simplified the code that was calculating the current context usage. The previous code was retrieving all of the contents and then calculating its size. This can be done in a single sql query - no need to transfer all the data over the network each time. I've tested this against postgres and sqlite.