Skip to content

Add missing await to sleep calls #18763

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.

Sign up for GitHub

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

Merged
anoadragon453 merged 2 commits into from
Aug 1, 2025
Merged

Add missing await to sleep calls #18763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e95b7c5
Add missing `await` to sleep calls
anoadragon453 Aug 1, 2025
f839762
newsfile
anoadragon453 Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/18763.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix an issue that could cause logcontexts to be lost on rate-limited requests. Found by @realtyem.
2 changes: 1 addition & 1 deletion synapse/http/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ async def _async_render_wrapper(self, request: "SynapseRequest") -> None:
callback_return = await self._async_render(request)
except LimitExceededError as e:
if e.pause:
self._clock.sleep(e.pause)
await self._clock.sleep(e.pause)
Copy link
Copy Markdown
Contributor

@MadLittleMods MadLittleMods Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this something we can lint?

We already detect this kind of thing for async/await

error: Value of type "Coroutine[Any, Any, None]" must be used  [unused-coroutine]
note: Are you missing an await?

Copy link
Copy Markdown
Member

@erikjohnston erikjohnston Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh mmm, we probably want to change the return type of sleep

Copy link
Copy Markdown
Member

@erikjohnston erikjohnston Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this here: #18772

raise

if callback_return is not None:
Expand Down
2 changes: 1 addition & 1 deletion synapse/storage/databases/main/deviceinbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ def _delete_old_federation_inbox_rows_txn(txn: LoggingTransaction) -> bool:

# We sleep a bit so that we don't hammer the database in a tight
# loop first time we run this.
self._clock.sleep(1)
await self._clock.sleep(1)

async def get_devices_with_messages(
self, user_id: str, device_ids: StrCollection
Expand Down
Loading
⚡