Skip to content
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

YQ-4071 Fix exception handling in topic session #14055

Merged
merged 2 commits into from
Feb 3, 2025
Merged

YQ-4071 Fix exception handling in topic session #14055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff4723
fix exception handling
kardymonds Jan 31, 2025
ab7e122
add new method
kardymonds Jan 31, 2025
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
16 changes: 11 additions & 5 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 @@ -288,7 +288,8 @@ class TTopicSession : public TActorBootstrapped<TTopicSession> {
void SubscribeOnNextEvent();
void SendToParsing(const std::vector<NYdb::NTopic::TReadSessionEvent::TDataReceivedEvent::TMessage>& messages);
void SendData(TClientsInfo& info);
void FatalError(TStatus status);
void FatalError(const TStatus& status);
void ThrowFatalError(const TStatus& status);
void SendDataArrived(TClientsInfo& client);
void StopReadSession();
TString GetSessionId() const;
Expand Down Expand Up @@ -332,7 +333,8 @@ class TTopicSession : public TActorBootstrapped<TTopicSession> {
IgnoreFunc(TEvRowDispatcher::TEvGetNextBatch);
IgnoreFunc(NFq::TEvRowDispatcher::TEvStartSession);
IgnoreFunc(NFq::TEvRowDispatcher::TEvStopSession);
IgnoreFunc(NFq::TEvPrivate::TEvSendStatistic);,
IgnoreFunc(NFq::TEvPrivate::TEvSendStatistic);
IgnoreFunc(NFq::TEvPrivate::TEvReconnectSession);,
ExceptionFunc(std::exception, HandleException)
)
};
Expand Down Expand Up @@ -567,7 +569,7 @@ void TTopicSession::TTopicEventProcessor::operator()(NYdb::NTopic::TSessionClose
const TString message = TStringBuilder() << "Read session to topic \"" << Self.TopicPathPartition << "\" was closed";
LOG_ROW_DISPATCHER_DEBUG(message << ": " << ev.DebugString());

Self.FatalError(TStatus::Fail(
Self.ThrowFatalError(TStatus::Fail(
NYql::NDq::YdbStatusToDqStatus(static_cast<Ydb::StatusIds::StatusCode>(ev.GetStatus())),
NYdb::NAdapters::ToYqlIssues(ev.GetIssues())
).AddParentIssue(message));
Expand Down Expand Up @@ -782,7 +784,7 @@ void TTopicSession::RestartSessionIfOldestClient(const TClientsInfo& info) {
}
}

void TTopicSession::FatalError(TStatus status) {
void TTopicSession::FatalError(const TStatus& status) {
LOG_ROW_DISPATCHER_ERROR("FatalError: " << status.GetErrorMessage());

for (auto& [readActorId, info] : Clients) {
Expand All @@ -791,7 +793,11 @@ void TTopicSession::FatalError(TStatus status) {
}
StopReadSession();
Become(&TTopicSession::ErrorState);
ythrow yexception() << "FatalError: " << status.GetErrorMessage(); // To exit from current stack and call once PassAway() in HandleException().
}

void TTopicSession::ThrowFatalError(const TStatus& status) {
FatalError(status);
ythrow yexception() << "FatalError: " << status.GetErrorMessage();
}

void TTopicSession::SendSessionError(TActorId readActorId, TStatus status) {
Expand Down
Loading