From 846e316cbc6d7f89ac63a5adcc10439c9f68becd Mon Sep 17 00:00:00 2001
From: Kirill Pleshivtsev <drbasic@yandex-team.ru>
Date: Mon, 3 Feb 2025 19:35:40 +0700
Subject: [PATCH] Fix vhost test flakiness (#2963)

---
 cloud/blockstore/vhost-server/server_ut.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cloud/blockstore/vhost-server/server_ut.cpp b/cloud/blockstore/vhost-server/server_ut.cpp
index 71623b1a635..b741f495504 100644
--- a/cloud/blockstore/vhost-server/server_ut.cpp
+++ b/cloud/blockstore/vhost-server/server_ut.cpp
@@ -290,7 +290,21 @@ class TServerTest
         TSimpleStats prevStats;
         TCompleteStats stats;
         for (int i = 0; i != 5; ++i) {
+            // Save critical events from previous attempt.
+            auto critEvents = std::move(stats.CriticalEvents);
+
             stats = Server->GetStats(prevStats);
+
+            // Combine critical events from previous and current attempt.
+            if (critEvents) {
+                for (auto& critEvent: stats.CriticalEvents) {
+                    critEvents.push_back(std::move(critEvent));
+                }
+                stats.CriticalEvents = std::move(critEvents);
+            }
+
+            // Check that the current attempt to get statistics has brought
+            // everything we need.
             if (func(stats)) {
                 break;
             }