Fix server shutdown for Python 3.10-3.12 #75
Merged
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
dlqqq
commented
May 21, 2025
Comment on lines
-227
to
-231
| # Do nothing if content was not loaded first. This prevents overwriting | ||
| # the existing file with an empty JupyterYDoc. | ||
| if not (self._ydoc_content_loaded.is_set()): | ||
| return | ||
|
|
Collaborator
Author
There was a problem hiding this comment.
These lines were never called, since the _process_scheduled_saves() task always waits on the content to be loaded. Since the server won't stop until all of the background tasks are stopped, the content is always loaded before shutdown and we don't need to check its status.
We can add a way to cancel the initial content loading while the server is shutting down in a future PR. That change would only speed up server shutdown by 1-100 ms, so I don't think it's a priority for us right now.
Zsailer
approved these changes
May 21, 2025
Collaborator
|
Thanks, @dlqqq ! Looks great. Pulled this PR down and tried it on Python 3.10. Works great. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Description
asyncio.Queue.shutdown()withasyncio.Queue.put_nowait(None).YRoomandYRoomFileAPIreceives an item of valueNone, the background task watching that queue will shut down.Testing instructions
python=3.10andjupyterlab=4.4(our extension still requires JL >=4.4)jlpm dev:installFuture work