Repository navigation
fix(telegram): close reconnect races that leave adapter half-destroyed (salvage #56036) #231
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🟡 Removed local-reference snapshot reintroduces race condition in Telegram polling conflict recovery (bug)
In
_handle_polling_conflictatplugins/platforms/telegram/adapter.py, the patch removed the local variable snapshotapp = self._appthat was captured before two await points (lines 2165-2166:asyncio.sleep(RETRY_DELAY)andawait self._drain_polling_connections()). The removed code comments explicitly documented thatself._appcan be reassigned toNoneby a concurrentdisconnect()during those awaits, citing issue NousResearch#55992.After the patch, line 2169 reads
self._appdirectly:await self._app.updater.start_polling(...). Ifdisconnect()(line 3042:self._app = None) runs concurrently during the await suspension — e.g., from a gateway shutdown callingstop()→_bounded_adapter_teardown→disconnect()— accessingself._app.updaterraisesAttributeError: 'NoneType' object has no attribute 'updater'.The sibling method
_handle_polling_network_error(line 1780) still preserves the exact same capture pattern with an explicit comment about the concurrent disconnect() race, confirming the pattern was deliberately applied to protect async re-entrancy in PTB error callbacks.Impact is bounded because the
except Exceptionhandler at line 2180 catches both the oldRuntimeErrorand the newAttributeError, rescheduling a retry. The regression is primarily in diagnostic quality (unclear error message vs. explicit 'Telegram application was torn down') and the reintroduction of a known, previously-fixed race pattern.💡 Suggestion: Restore the local-reference snapshot pattern that was removed: before the try block at line 2168, capture
app = self._app. Then inside the try, guard withif not app: raise RuntimeError('Telegram application was torn down during conflict reconnect')and useapp.updater.start_polling(...)instead ofself._app.updater.start_polling(...). This matches the proven pattern still present in the sibling method_handle_polling_network_errorat lines 1780-1793.📋 Prompt for AI Agents
In
plugins/platforms/telegram/adapter.py, restore the concurrency guard in_handle_polling_conflict:try:), add:app = self._apptry:\n await self._app.updater.start_polling(with:This restores the local-reference snapshot pattern that protects against
self._appbeing set toNoneby a concurrentdisconnect()during the await points above. The sibling method_handle_polling_network_errorat line 1780 still uses this pattern with the same documented rationale.