Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Don't do long retries when calling the key notary server. #5334

Merged
merged 1 commit into from
Jun 4, 2019
Merged

Don't do long retries when calling the key notary server. #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/5334.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug which would make certain operations (such as room joins) block for 20 minutes while attemoting to fetch verification keys.
1 change: 0 additions & 1 deletion synapse/crypto/keyring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,6 @@ def get_server_verify_key_v2_indirect(
for server_name, server_keys in keys_to_fetch.items()
}
},
long_retries=True,
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer to explicitly set long_retries=False rather than relying on the default tbh.

Copy link
Member Author

Choose a reason for hiding this comment

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

as discussed in #synapse-dev

  • we don't set long_retries=False anywhere else
  • given how long long_retries takes, you don't want to set it unless you really want it. Accordingly I think it makes sense for the default to be False and for everything to rely on that being the default.

)
except (NotRetryingDestination, RequestSendFailed) as e:
raise_from(KeyLookupError("Failed to connect to remote server"), e)
Expand Down