From 4194071f6e7945e6719c806e4d17f0ad675f1949 Mon Sep 17 00:00:00 2001 From: Roman Gershman Date: Sun, 21 Jul 2024 11:41:20 +0300 Subject: [PATCH 1/2] chore: pull helio --- helio | 2 +- src/server/engine_shard_set.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/helio b/helio index deb4c1ac263c..288cb312971f 160000 --- a/helio +++ b/helio @@ -1 +1 @@ -Subproject commit deb4c1ac263c00d6602a3e1158ccae04a9b28417 +Subproject commit 288cb312971f07cd35fa3a75fcfe047788d7d0fb diff --git a/src/server/engine_shard_set.cc b/src/server/engine_shard_set.cc index 9fd4ee678085..f216e3b60f2e 100644 --- a/src/server/engine_shard_set.cc +++ b/src/server/engine_shard_set.cc @@ -680,6 +680,8 @@ void EngineShard::RunPeriodic(std::chrono::milliseconds period_ms) { // Every 8 runs, update the global stats. if (global_count % 8 == 0) { + DVLOG(2) << "Global periodic"; + uint64_t sum = 0; const auto& stats = EngineShardSet::GetCachedStats(); for (const auto& s : stats) From 725bc4691d9299e0a9ccebd0c68d5771e8b9a1aa Mon Sep 17 00:00:00 2001 From: Roman Gershman Date: Sun, 21 Jul 2024 14:37:01 +0300 Subject: [PATCH 2/2] fix: tests Signed-off-by: Roman Gershman --- src/server/tiered_storage_test.cc | 5 +++-- tests/dragonfly/connection_test.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server/tiered_storage_test.cc b/src/server/tiered_storage_test.cc index 5194da8dfae1..8c31831878e0 100644 --- a/src/server/tiered_storage_test.cc +++ b/src/server/tiered_storage_test.cc @@ -206,9 +206,10 @@ TEST_F(TieredStorageTest, BackgroundOffloading) { // Wait for offload to do it all again ExpectConditionWithinTimeout([&] { return GetMetrics().db_stats[0].tiered_entries == kNum; }); - + auto resp = Run({"INFO", "ALL"}); + LOG(INFO) << "INFO " << resp.GetString(); auto metrics = GetMetrics(); - EXPECT_EQ(metrics.tiered_stats.total_stashes, 2 * kNum); + EXPECT_EQ(metrics.tiered_stats.total_stashes, 2 * kNum) << resp.GetString(); EXPECT_EQ(metrics.tiered_stats.total_fetches, kNum); EXPECT_EQ(metrics.tiered_stats.allocated_bytes, kNum * 4096); } diff --git a/tests/dragonfly/connection_test.py b/tests/dragonfly/connection_test.py index 763be009d85d..7e7d5b8d33fd 100755 --- a/tests/dragonfly/connection_test.py +++ b/tests/dragonfly/connection_test.py @@ -587,7 +587,7 @@ async def test_parser_memory_stats(df_server, async_client: aioredis.Redis): await writer.drain() # writer is pending because the request is not finished. stats = await async_client.execute_command("memory stats") - assert stats["connections.direct_bytes"] > 150000 + assert stats["connections.direct_bytes"] > 130000 async def test_reject_non_tls_connections_on_tls(with_tls_server_args, df_factory):