Skip to content

YQ-3909 Shared reading: fix Ingress statistics #11943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2024
+11 −3
Merged

YQ-3909 Shared reading: fix Ingress statistics #11943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce0fbf
fix sending stats
kardymonds Nov 25, 2024
46a8268
try to fix asan
kardymonds Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ydb/core/fq/libs/row_dispatcher/topic_session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,6 @@ void TTopicSession::Handle(NFq::TEvPrivate::TEvSendStatisticToReadActor::TPtr&)
if (!info.NextMessageOffset) {
continue;
}
if (*info.NextMessageOffset <= info.LastSendedNextMessageOffset) {
continue;
}
auto event = std::make_unique<TEvRowDispatcher::TEvStatistics>();
event->Record.SetPartitionId(PartitionId);
event->Record.SetNextMessageOffset(*info.NextMessageOffset);
Expand Down
11 changes: 11 additions & 0 deletions ydb/core/fq/libs/row_dispatcher/ut/topic_session_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,16 @@ class TFixture : public NUnitTest::TBaseFixture {
return eventHolder->Get()->Record.MessagesSize();
}

void ExpectStatisticToReadActor(TSet<NActors::TActorId> readActorIds) {
size_t count = readActorIds.size();
for (size_t i = 0; i < count; ++i) {
auto eventHolder = Runtime.GrabEdgeEvent<TEvRowDispatcher::TEvStatistics>(RowDispatcherActorId, TDuration::Seconds(GrabTimeoutSec));
UNIT_ASSERT(eventHolder.Get() != nullptr);
UNIT_ASSERT(readActorIds.contains(eventHolder->Get()->ReadActorId));
readActorIds.erase(eventHolder->Get()->ReadActorId);
}
}

IPureCalcProgramFactory::TPtr PureCalcProgramFactory;
NActors::TTestActorRuntime Runtime;
TActorSystemStub ActorSystemStub;
Expand Down Expand Up @@ -194,6 +204,7 @@ Y_UNIT_TEST_SUITE(TopicSessionTests) {
ExpectNewDataArrived({ReadActorId1, ReadActorId2});
ExpectMessageBatch(ReadActorId1, { Json1 });
ExpectMessageBatch(ReadActorId2, { Json1 });
ExpectStatisticToReadActor({ReadActorId1, ReadActorId2});

auto source2 = BuildSource(topicName, false, "OtherConsumer");
StartSession(ReadActorId3, source2);
Expand Down
Loading