mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

chore: improve test_timeout robustness (#4494)

Browse source 
1. use assert_eventually
2. add more logs
3. unrelated - add a stats event to track timeout shutdowns.
This commit is contained in:
Roman Gershman 2025-01-22 14:24:29 +02:00 • committed by GitHub
parent 4a2f2e3d04
commit 451da72c41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/server/server_family.cc
View file

@ -2290,6 +2290,7 @@ void ServerFamily::Info(CmdArgList args, const CommandContext& cmd_cntx) {
append("pipeline_queue_length", m.facade_stats.conn_stats.dispatch_queue_entries); append("pipeline_queue_length", m.facade_stats.conn_stats.dispatch_queue_entries);
append("send_delay_ms", GetDelayMs(m.oldest_pending_send_ts)); append("send_delay_ms", GetDelayMs(m.oldest_pending_send_ts));
append("timeout_disconnects", m.coordinator_stats.conn_timeout_events);
} }
if (should_enter("MEMORY")) { if (should_enter("MEMORY")) {

5
src/server/server_state.cc
View file

@ -34,7 +34,7 @@ ServerState::Stats::Stats(unsigned num_shards) : tx_width_freq_arr(num_shards) {
} }
ServerState::Stats& ServerState::Stats::Add(const ServerState::Stats& other) { ServerState::Stats& ServerState::Stats::Add(const ServerState::Stats& other) {
static_assert(sizeof(Stats) == 19 * 8, "Stats size mismatch"); static_assert(sizeof(Stats) == 20 * 8, "Stats size mismatch");
#define ADD(x) this->x += (other.x) #define ADD(x) this->x += (other.x)
@ -61,7 +61,7 @@ ServerState::Stats& ServerState::Stats::Add(const ServerState::Stats& other) {
ADD(compressed_blobs); ADD(compressed_blobs);
ADD(oom_error_cmd_cnt); ADD(oom_error_cmd_cnt);
ADD(conn_timeout_events);
if (this->tx_width_freq_arr.size() > 0) { if (this->tx_width_freq_arr.size() > 0) {
DCHECK_EQ(this->tx_width_freq_arr.size(), other.tx_width_freq_arr.size()); DCHECK_EQ(this->tx_width_freq_arr.size(), other.tx_width_freq_arr.size());
this->tx_width_freq_arr += other.tx_width_freq_arr; this->tx_width_freq_arr += other.tx_width_freq_arr;
@ -279,6 +279,7 @@ void ServerState::ConnectionsWatcherFb(util::ListenerInterface* main) {
if (conn) { if (conn) {
VLOG(1) << "Closing connection due to timeout: " << conn->GetClientInfo(); VLOG(1) << "Closing connection due to timeout: " << conn->GetClientInfo();
conn->ShutdownSelf(); conn->ShutdownSelf();
stats.conn_timeout_events++;
} }
} }
} }

1
src/server/server_state.h
View file

@ -131,6 +131,7 @@ class ServerState { // public struct - to allow initialization.
// Number of times we rejected command dispatch due to OOM condition. // Number of times we rejected command dispatch due to OOM condition.
uint64_t oom_error_cmd_cnt = 0; uint64_t oom_error_cmd_cnt = 0;
uint32_t conn_timeout_events = 0;
std::valarray<uint64_t> tx_width_freq_arr; std::valarray<uint64_t> tx_width_freq_arr;
}; };

11
tests/dragonfly/connection_test.py
View file

@ -1059,6 +1059,15 @@ async def test_timeout(df_server: DflyInstance, async_client: aioredis.Redis):
await another_client.ping() await another_client.ping()
clients = await async_client.client_list() clients = await async_client.client_list()
assert len(clients) == 2 assert len(clients) == 2
await asyncio.sleep(2) await asyncio.sleep(2)
@assert_eventually
async def wait_for_conn_drop():
clients = await async_client.client_list() clients = await async_client.client_list()
assert len(clients) == 1 logging.info("clients: %s", clients)
assert len(clients) <= 1
await wait_for_conn_drop()
info = await async_client.info("clients")
assert int(info["timeout_disconnects"]) >= 1