ref: fix typing for sentry.db.postgres.base #96694
Closed
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
_set_isolation_level was removed in django/django@64a899d released in django 1.9
github-actions
bot
added
the
Scope: Backend
asottile-sentry
commented
Jul 29, 2025
Comment on lines
-106
to
-108
| @auto_reconnect_connection | ||
| def _cursor(self, *args, **kwargs): | ||
| return super()._cursor() |
There was a problem hiding this comment.
def cursor just calls def _cursor anyway so this should be a tiny simplification
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| @@ -21,7 +21,7 @@ def inner(self, *args, **kwargs): | |||
| raise | |||
|
|
|||
| self.db.close(reconnect=True) | |||
| self.cursor = self.db._cursor() | |||
| self.cursor = self.db.cursor() | |||
There was a problem hiding this comment.
Bug: Auto-Reconnect Cursor Wraps Incorrectly
The auto_reconnect_cursor decorator, when applied to CursorWrapper methods, now incorrectly re-initializes self.cursor to another CursorWrapper instance instead of the raw underlying cursor. This happens because self.db.cursor() returns a CursorWrapper, leading to improper nested wrapping and breaking the CursorWrapper's delegation mechanism.
Locations (1)
There was a problem hiding this comment.
that's what already happens silly bot
![seer-by-sentry[bot]](https://avatars.githubusercontent.com/in/801464?s=60&v=4){kind=small}
Comment on lines
+24
to
25
| self.cursor = self.db.cursor() | ||
|
|
There was a problem hiding this comment.
Potential bug: Auto-reconnect logic double-wraps cursors, causing `AttributeError` or recursion when `self.cursor` is reassigned after reconnection.
- Description: The
CursorWrapperexpectsself.cursorto be the underlying psycopg2 cursor. However, during a database reconnection, theauto_reconnect_cursordecorator atsrc/sentry/db/postgres/decorators.py:24assignsself.db.cursor()toself.cursor. Sinceself.db.cursor()now returns aCursorWrapper, this results in aCursorWrappercontaining anotherCursorWrapper. This double-wrapping can lead toAttributeErrorexceptions, infinite recursion, or method resolution issues when accessing cursor-specific methods, effectively crashing the application during reconnection events. - Suggested fix: Modify the
auto_reconnect_cursordecorator to ensureself.cursoris assigned the raw psycopg2 cursor, not anotherCursorWrapper, after reconnection. This might involve adjustingself.db.cursor()'s behavior or explicitly unwrapping the cursor before assignment to prevent nested wrappers.
severity: 0.9, confidence: 0.95
Did we get this right? 👍 / 👎 to inform future reviews.
There was a problem hiding this comment.
you too, read the original code
❌ 5 Tests Failed:
View the top 3 failed test(s) by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
vgrozdanic
approved these changes
Jul 30, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
_set_isolation_level was removed in django/django@64a899d released in django 1.9