ember/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: Warn when server is overloaded

Browse source
This commit is contained in:
nexy7574 2026-02-21 16:58:45 +00:00 • committed by timedout
parent 81b202ce51
commit 66bbb655bf
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/server/send.rs
View file

@ -7,7 +7,7 @@ use std::{
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; use axum_client_ip::InsecureClientIp;
use conduwuit::{ use conduwuit::{
Err, Error, Result, debug, debug_warn, err, error, info, Err, Error, Result, debug, debug_warn, err, error,
result::LogErr, result::LogErr,
trace, trace,
utils::{ utils::{

17
src/service/transaction_ids/mod.rs
View file

@ -1,7 +1,7 @@
use std::{collections::HashMap, sync::Arc}; use std::{collections::HashMap, sync::Arc};
use async_trait::async_trait; use async_trait::async_trait;
use conduwuit::{Error, Result, SyncRwLock}; use conduwuit::{Error, Result, SyncRwLock, debug, debug_warn, warn};
use database::{Handle, Map}; use database::{Handle, Map};
use ruma::{ use ruma::{
DeviceId, OwnedServerName, OwnedTransactionId, TransactionId, UserId, DeviceId, OwnedServerName, OwnedTransactionId, TransactionId, UserId,
@ -52,7 +52,6 @@ impl crate::Service for Service {
} }
impl Service { impl Service {
#[must_use] #[must_use]
pub fn txn_active_handle_count(&self) -> usize { pub fn txn_active_handle_count(&self) -> usize {
let state = self.servername_txnid_active.read(); let state = self.servername_txnid_active.read();
@ -106,16 +105,30 @@ impl Service {
) -> Result<Sender<WrappedTransactionResponse>> { ) -> Result<Sender<WrappedTransactionResponse>> {
let mut state = self.servername_txnid_active.write(); let mut state = self.servername_txnid_active.write();
if state.get(&key).is_some() { if state.get(&key).is_some() {
debug!(
origin = ?key.0,
id = ?key.1,
"Origin re-sent already running transaction"
);
Err(Error::BadRequest( Err(Error::BadRequest(
LimitExceeded { retry_after: None }, LimitExceeded { retry_after: None },
"Transaction is already being handled", "Transaction is already being handled",
)) ))
} else if state.keys().any(|k| k.0 == key.0) { } else if state.keys().any(|k| k.0 == key.0) {
debug_warn!(
origin = ?key.0,
"Got concurrent transaction request from an origin with an active transaction"
);
Err(Error::BadRequest( Err(Error::BadRequest(
LimitExceeded { retry_after: None }, LimitExceeded { retry_after: None },
"Still processing another transaction from this origin", "Still processing another transaction from this origin",
)) ))
} else if state.len() >= self.max_active_txns { } else if state.len() >= self.max_active_txns {
warn!(
active = state.len(),
max = self.max_active_txns,
"Server is overloaded, dropping incoming transaction"
);
Err(Error::BadRequest( Err(Error::BadRequest(
LimitExceeded { retry_after: None }, LimitExceeded { retry_after: None },
"Server is overloaded, try again later", "Server is overloaded, try again later",