fix: Allow a process to acquire a lease its already acquired #2735
Conversation
This file contains 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
Related: GlareDB/cloud#2746 Previously we weren't allowing it just errored with something along the lines of: ``` Catalog error: Lease for database 'a9edc39a-6129-4b19-b8dc-02483df4fc6e' held by other process; other_process_id: d7796f4c-c3e4-4822-b59e-1b4b9f32a48d, current_process_id: d7796f4c-c3e4-4822-b59e-1b4b9f32a48d ``` I believe I originally intended to allow a leaser to acquire a lease its already acquired based on the error message. This doesn't fix the rate limit issue, but does partially alleviate errors causes by failing to drop leases because dropping the lease failed due to a rate limit.
tychoish
approved these changes
Mar 5, 2024
| @@ -242,7 +242,7 @@ impl LeaseRenewer { | |||
| })?; | |||
|
|
|||
| // Some other process has the lease. | |||
| if expires_at > now { | |||
| if expires_at > now && held_by != self.process_id { | |||
There was a problem hiding this comment.
i presume that self.process_id is a UUID generated on process start?
There was a problem hiding this comment.
universalmind303
approved these changes
Mar 5, 2024
tychoish
pushed a commit
that referenced
this pull request
Mar 6, 2024
Related: https://github.com/GlareDB/cloud/issues/2746 Previously we weren't allowing it just errored with something along the lines of: ``` Catalog error: Lease for database 'a9edc39a-6129-4b19-b8dc-02483df4fc6e' held by other process; other_process_id: d7796f4c-c3e4-4822-b59e-1b4b9f32a48d, current_process_id: d7796f4c-c3e4-4822-b59e-1b4b9f32a48d ``` I believe I originally intended to allow a leaser to acquire a lease its already acquired based on the error message. This doesn't fix the rate limit issue, but does partially alleviate errors causes by failing to drop leases because dropping the lease failed due to a rate limit.
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.
Related: https://github.com/GlareDB/cloud/issues/2746
Previously we weren't allowing it just errored with something along the lines of:
I believe I originally intended to allow a leaser to acquire a lease its already acquired based on the error message.
This doesn't fix the rate limit issue, but does partially alleviate errors causes by failing to drop leases because dropping the lease failed due to a rate limit.