GH-109564: add asyncio.Server state machine #131009
+73
−27
fix: change match to if statements
- Loading branch information
commit 8e409b7eb61062b8ec45672180965f6beacab9f2
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -322,16 +322,15 @@ def _detach(self, transport): | |
| self._wakeup() | ||
|
|
||
| def _wakeup(self): | ||
| if self._state == _ServerState.CLOSED: | ||
| self._state = _ServerState.SHUTDOWN | ||
| elif self._state == _ServerState.SHUTDOWN: | ||
| # gh109564: the wakeup method has two possible call-sites, | ||
| # through an explicit call Server.close(), or indirectly through | ||
| # Server._detach() by the last connected client. | ||
| return | ||
| else: | ||
| raise RuntimeError(f"server {self!r} can only wakeup waiters after closing") | ||
|
|
||
| waiters = self._waiters | ||
| self._waiters = None | ||
|
|
@@ -340,13 +339,12 @@ def _wakeup(self): | |
| waiter.set_result(None) | ||
|
|
||
| def _start_serving(self): | ||
| if self._state == _ServerState.INITIALIZED: | ||
| self._state = _ServerState.SERVING | ||
| elif self._state == _ServerState.SERVING: | ||
| return | ||
| else: | ||
| raise RuntimeError(f'server {self!r} is closed') | ||
ordinary-jamie marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| for sock in self._sockets: | ||
| sock.listen(self._backlog) | ||
|
|
@@ -368,12 +366,10 @@ def sockets(self): | |
| return tuple(trsock.TransportSocket(s) for s in self._sockets) | ||
|
|
||
| def close(self): | ||
| if self._state == _ServerState.CLOSED or self._state == _ServerState.SHUTDOWN: | ||
ordinary-jamie marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return | ||
| else: | ||
| self._state = _ServerState.CLOSED | ||
|
There was a problem hiding this comment. What happens if something magically goes wrong after this has been set? Is the server still alive while thinking it's closed? It might be worth adding a There was a problem hiding this comment. Ah great point! Although I'm not sure how that would look from a user's point of view. Should we give them a warning to let them know they must try to close the server again? Alternatively, should we expose something like a I pushed an initial fix with a simple |
||
|
|
||
| sockets = self._sockets | ||
| if sockets is None: | ||
|
|
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.
This error message isn't making much sense to me. We'll never reach here "after closing," right? This can only be triggered when the state is
SERVINGorINITIALIZED.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.
Sorry this is bad wording, I was trying to say that the Server must be closed before it can be shutdown (i.e. we cannot shutdown from the
SERVINGstate, nor theINITIALIZED/NOT_STARTEDstate)Made a fix in: 7f3481b