Skip to content

Commit 66ffca2

Browse files
committed
fix test: don\t wait 240 sec if unlucky
1 parent ecfd110 commit 66ffca2

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

ydb/core/persqueue/pqrb/mirror_describer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ void TMirrorDescriber::HandleChangeConfig(TEvPQ::TEvChangePartitionConfig::TPtr&
4141
Config,
4242
ev->Get()->Config.GetPartitionConfig().GetMirrorFrom()
4343
);
44-
LOG_NOTICE_S(ctx, NKikimrServices::PQ_MIRROR_DESCRIBER, LogDescription() << " got new config, equal with previous: " << equalConfigs);
44+
LOG_INFO_S(ctx, NKikimrServices::PQ_MIRROR_DESCRIBER, LogDescription() << " got new config, equal with previous: " << equalConfigs);
4545
if (!equalConfigs) {
4646
Config = ev->Get()->Config.GetPartitionConfig().GetMirrorFrom();
47-
LOG_NOTICE_S(ctx, NKikimrServices::PQ_MIRROR_DESCRIBER, LogDescription() << " changing config");
47+
LOG_INFO_S(ctx, NKikimrServices::PQ_MIRROR_DESCRIBER, LogDescription() << " changing config");
4848
StartInit(ctx);
4949
}
5050
}

ydb/core/persqueue/ut/ut_with_sdk/mirrorer_autoscaling_ut.cpp

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ namespace NKikimr::NPersQueueTests {
321321
Server.CleverServer->GetRuntime()->GetAppData(nodeId).PersQueueMirrorReaderFactory = Fabric.get();
322322
}
323323

324-
Server.EnableLogs({NKikimrServices::PQ_READ_PROXY, NKikimrServices::PQ_MIRRORER, NKikimrServices::PQ_MIRROR_DESCRIBER});
324+
Server.EnableLogs({NKikimrServices::PQ_READ_PROXY});
325+
Server.EnableLogs({NKikimrServices::PQ_MIRRORER, NKikimrServices::PQ_MIRROR_DESCRIBER}, NActors::NLog::PRI_TRACE);
325326
Server.AnnoyingClient->CreateConsumer("user");
326327
}
327328

@@ -1038,6 +1039,21 @@ namespace NKikimr::NPersQueueTests {
10381039
/*ui64 sourceIdLifetime =*/86400,
10391040
partitionStrategy);
10401041

1042+
1043+
UNIT_ASSERT_VALUES_EQUAL(CountPartitionsByStatus(srcTopicFullName, server).Active, 2);
1044+
1045+
for (TString name : {srcTopicFullName, }) {
1046+
PrintTopicDescription(name, "2", server);
1047+
}
1048+
PrechargeTopic(srcTopic, driver, sourcesCount, 1, 1, {});
1049+
UNIT_ASSERT_VALUES_EQUAL(CountPartitionsByStatus(srcTopicFullName, server).Active, 2);
1050+
for (TString name : {srcTopicFullName, }) {
1051+
PrintTopicDescription(name, "3", server);
1052+
}
1053+
1054+
ui64 txId = 1006;
1055+
SplitPartition(txId++, srcTopicFullName, 1, "\xC0", *ctx.Runtime());
1056+
10411057
NKikimrPQ::TMirrorPartitionConfig mirrorFrom;
10421058
mirrorFrom.SetEndpoint("localhost");
10431059
mirrorFrom.SetEndpointPort(ctx.Server.GrpcPort);
@@ -1060,24 +1076,11 @@ namespace NKikimr::NPersQueueTests {
10601076
/*ui64 sourceIdLifetime =*/86400,
10611077
partitionStrategy);
10621078

1063-
UNIT_ASSERT_VALUES_EQUAL(CountPartitionsByStatus(srcTopicFullName, server).Active, 2);
1064-
// UNIT_ASSERT_VALUES_EQUAL(CountPartitionsByStatus(dstTopicFullName, server).Active, 2);
1065-
for (TString name : {srcTopicFullName, dstTopicFullName}) {
1066-
PrintTopicDescription(name, "2", server);
1067-
}
1068-
PrechargeTopic(srcTopic, driver, sourcesCount, 1, 1, {});
1069-
UNIT_ASSERT_VALUES_EQUAL(CountPartitionsByStatus(srcTopicFullName, server).Active, 2);
1070-
// UNIT_ASSERT_VALUES_EQUAL(CountPartitionsByStatus(dstTopicFullName, server).Active, 2);
1071-
for (TString name : {srcTopicFullName, dstTopicFullName}) {
1072-
PrintTopicDescription(name, "3", server);
1073-
}
1074-
1075-
ui64 txId = 1006;
1076-
SplitPartition(txId++, srcTopicFullName, 1, "\xC0", *ctx.Runtime());
1077-
for (TString name : {srcTopicFullName, dstTopicFullName}) {
1079+
for (TString name : {srcTopicFullName, }) {
10781080
PrintTopicDescription(name, "4", server);
10791081
}
10801082

1083+
10811084
THashMap<ui32, ui32> messagesPerPartition;
10821085
// write to source topic
10831086
constexpr TWriteCount writeBatch[]{

0 commit comments

Comments
 (0)