Skip to content

Commit 35b7249

Browse files
ildar-khisambeevqyryq
authored andcommitted
KIKIMR-20611 fix hanging test (ydb-platform#1938)
1 parent 5d81fd4 commit 35b7249

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

ydb/core/persqueue/ut/mirrorer_ut.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) {
154154

155155
}
156156

157+
srcReader->Close(TDuration::Zero());
158+
dstReader->Close(TDuration::Zero());
159+
157160
// write to source topic
158161
TVector<ui32> messagesPerPartition(partitionsCount, 0);
159162
for (ui32 partition = 0; partition < partitionsCount; ++partition) {
@@ -163,7 +166,7 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) {
163166
{"some_extra_field2", "another_value" + ToString(partition)},
164167
{"file", "/home/user/log" + ToString(partition)}
165168
};
166-
auto writer = CreateSimpleWriter(*driver, srcTopic, sourceId, partition + 1, std::nullopt, std::nullopt, sessionMeta);
169+
auto writer = CreateSimpleWriter(*driver, srcTopic, sourceId, partition + 1, std::nullopt, std::nullopt, sessionMeta);
167170

168171
ui64 seqNo = writer->GetInitSeqNo();
169172

@@ -211,10 +214,10 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) {
211214
auto dstReader = createReader(dstTopic, partition);
212215

213216
for (ui32 i = 0; i < messagesPerPartition[partition]; ++i) {
214-
auto dstEvent = GetNextMessageSkipAssignment(dstReader);
217+
auto dstEvent = GetNextMessageSkipAssignment(dstReader, TDuration::Seconds(1));
215218
UNIT_ASSERT(dstEvent);
216219
Cerr << "Destination read message: " << dstEvent->DebugString() << "\n";
217-
auto srcEvent = GetNextMessageSkipAssignment(srcReader);
220+
auto srcEvent = GetNextMessageSkipAssignment(srcReader, TDuration::Seconds(1));
218221
UNIT_ASSERT(srcEvent);
219222
Cerr << "Source read message: " << srcEvent->DebugString() << "\n";
220223

@@ -263,7 +266,7 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) {
263266
server.AnnoyingClient->CreateTopic(topicFullName, 1);
264267

265268
auto driver = server.AnnoyingClient->GetDriver();
266-
auto writer = CreateSimpleWriter(*driver, topic, "src-id-test");
269+
auto writer = CreateSimpleWriter(*driver, topic, "src-id-test");
267270
for (auto i = 0u; i < 5; i++) {
268271
auto res = writer->Write(TString(10, 'a'));
269272
UNIT_ASSERT(res);
@@ -299,7 +302,7 @@ Y_UNIT_TEST_SUITE(TPersQueueMirrorer) {
299302
break;
300303
}
301304
}
302-
305+
303306
for (auto i = 0u; i < 5; i++) {
304307
auto res = writer->Write(TString(10, 'b'));
305308
UNIT_ASSERT(res);

ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,4 @@ namespace NKikimr::NPersQueueTests {
9999
}
100100
return {};
101101
}
102-
103-
104102
}

0 commit comments

Comments
 (0)