From 35b7249e71170938318ab56ee2a4b66414fe847c Mon Sep 17 00:00:00 2001 From: ildar-khisambeev Date: Thu, 15 Feb 2024 13:17:34 +0300 Subject: [PATCH] KIKIMR-20611 fix hanging test (#1938) --- ydb/core/persqueue/ut/mirrorer_ut.cpp | 13 ++++++++----- .../ut/ut_utils/data_plane_helpers.cpp | 2 -- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ydb/core/persqueue/ut/mirrorer_ut.cpp b/ydb/core/persqueue/ut/mirrorer_ut.cpp index 08f1af2c66e6..8a39005004af 100644 --- a/ydb/core/persqueue/ut/mirrorer_ut.cpp +++ b/ydb/core/persqueue/ut/mirrorer_ut.cpp @@ -154,6 +154,9 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) { } + srcReader->Close(TDuration::Zero()); + dstReader->Close(TDuration::Zero()); + // write to source topic TVector messagesPerPartition(partitionsCount, 0); for (ui32 partition = 0; partition < partitionsCount; ++partition) { @@ -163,7 +166,7 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) { {"some_extra_field2", "another_value" + ToString(partition)}, {"file", "/home/user/log" + ToString(partition)} }; - auto writer = CreateSimpleWriter(*driver, srcTopic, sourceId, partition + 1, std::nullopt, std::nullopt, sessionMeta); + auto writer = CreateSimpleWriter(*driver, srcTopic, sourceId, partition + 1, std::nullopt, std::nullopt, sessionMeta); ui64 seqNo = writer->GetInitSeqNo(); @@ -211,10 +214,10 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) { auto dstReader = createReader(dstTopic, partition); for (ui32 i = 0; i < messagesPerPartition[partition]; ++i) { - auto dstEvent = GetNextMessageSkipAssignment(dstReader); + auto dstEvent = GetNextMessageSkipAssignment(dstReader, TDuration::Seconds(1)); UNIT_ASSERT(dstEvent); Cerr << "Destination read message: " << dstEvent->DebugString() << "\n"; - auto srcEvent = GetNextMessageSkipAssignment(srcReader); + auto srcEvent = GetNextMessageSkipAssignment(srcReader, TDuration::Seconds(1)); UNIT_ASSERT(srcEvent); Cerr << "Source read message: " << srcEvent->DebugString() << "\n"; @@ -263,7 +266,7 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) { server.AnnoyingClient->CreateTopic(topicFullName, 1); auto driver = server.AnnoyingClient->GetDriver(); - auto writer = CreateSimpleWriter(*driver, topic, "src-id-test"); + auto writer = CreateSimpleWriter(*driver, topic, "src-id-test"); for (auto i = 0u; i < 5; i++) { auto res = writer->Write(TString(10, 'a')); UNIT_ASSERT(res); @@ -299,7 +302,7 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) { break; } } - + for (auto i = 0u; i < 5; i++) { auto res = writer->Write(TString(10, 'b')); UNIT_ASSERT(res); diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp index 6d29aa27c192..0ef9b8750f36 100644 --- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp +++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp @@ -99,6 +99,4 @@ namespace NKikimr::NPersQueueTests { } return {}; } - - }