Skip to content

Allow user deactivation on the Synapse side to take longer than 30s #4471

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
merged 2 commits into from
Apr 28, 2025
Merged

Allow user deactivation on the Synapse side to take longer than 30s #4471

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
28676f3
Remove the global read_timeout on the HTTP client
sandhose Apr 28, 2025
d7791db
Allow Synapse user deactivation to take up to 5 minutes
sandhose Apr 28, 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: 0 additions & 1 deletion crates/http/src/reqwest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pub fn client() -> reqwest::Client {
.user_agent(USER_AGENT)
.timeout(Duration::from_secs(60))
.connect_timeout(Duration::from_secs(30))
.read_timeout(Duration::from_secs(30))
.build()
.expect("failed to create HTTP client")
}
Expand Down
4 changes: 3 additions & 1 deletion crates/matrix-synapse/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.

use std::collections::HashSet;
use std::{collections::HashSet, time::Duration};

use anyhow::{Context, bail};
use error::SynapseResponseExt;
Expand Down Expand Up @@ -476,6 +476,8 @@ impl HomeserverConnection for SynapseConnection {
let response = self
.post(&format!("_synapse/admin/v1/deactivate/{mxid}"))
.json(&SynapseDeactivateUserRequest { erase })
// Deactivation can take a while, so we set a longer timeout
.timeout(Duration::from_secs(60 * 5))
.send_traced()
.await
.context("Failed to deactivate user in Synapse")?;
Expand Down
Loading