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

Jump to bottom

[BugFix] Fix thrift rpc not reopen after failed #49619

Merged
merged 1 commit into from
Aug 9, 2024
Merged

[BugFix] Fix thrift rpc not reopen after failed #49619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions be/src/exec/pipeline/audit_statistics_reporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Status AuditStatisticsReporter::report_audit_statistics(const TReportAuditStatis

rpc_status = Status(res.status);
} catch (TException& e) {
(void)coord.reopen(config::thrift_rpc_timeout_ms);
std::stringstream msg;
msg << "ReportExecStatus() to " << fe_addr << " failed:\n" << e.what();
LOG(WARNING) << msg.str();
Expand Down
2 changes: 2 additions & 0 deletions be/src/exec/pipeline/exec_state_reporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ Status ExecStateReporter::report_exec_status(const TReportExecStatusParams& para

rpc_status = Status(res.status);
} catch (TException& e) {
(void)coord.reopen(config::thrift_rpc_timeout_ms);
std::stringstream msg;
msg << "ReportExecStatus() to " << fe_addr << " failed:\n" << e.what();
LOG(WARNING) << msg.str();
Expand Down Expand Up @@ -304,6 +305,7 @@ Status ExecStateReporter::report_epoch(const TMVMaintenanceTasks& params, ExecEn

rpc_status = Status::OK();
} catch (TException& e) {
(void)coord.reopen(config::thrift_rpc_timeout_ms);
std::stringstream msg;
msg << "mvReport() to " << fe_addr << " failed:\n" << e.what();
LOG(WARNING) << msg.str();
Expand Down
2 changes: 2 additions & 0 deletions be/src/exec/pipeline/query_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ void QueryContextManager::report_fragments(

VLOG_ROW << "debug: reportExecStatus params is " << apache::thrift::ThriftDebugString(params).c_str();

// TODO: refactor me
try {
try {
fe_connection->batchReportExecStatus(res, report_batch);
Expand All @@ -675,6 +676,7 @@ void QueryContextManager::report_fragments(
}

} catch (TException& e) {
(void)fe_connection.reopen(config::thrift_rpc_timeout_ms);
std::stringstream msg;
msg << "ReportExecStatus() to " << fe_addr << " failed:\n" << e.what();
LOG(WARNING) << msg.str();
Expand Down
2 changes: 2 additions & 0 deletions be/src/runtime/fragment_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ void FragmentExecState::coordinator_callback(const Status& status, RuntimeProfil

rpc_status = Status(res.status);
} catch (TException& e) {
(void)coord.reopen(config::thrift_rpc_timeout_ms);
std::stringstream msg;
msg << "ReportExecStatus() to " << _coord_addr << " failed:\n" << e.what();
LOG(WARNING) << msg.str();
Expand Down Expand Up @@ -768,6 +769,7 @@ void FragmentMgr::report_fragments(const std::vector<TUniqueId>& non_pipeline_ne
}

} catch (TException& e) {
(void)fe_connection.reopen(config::thrift_rpc_timeout_ms);
std::stringstream msg;
msg << "ReportExecStatus() to " << fragment_exec_state->coord_addr() << " failed:\n" << e.what();
LOG(WARNING) << msg.str();
Expand Down
6 changes: 0 additions & 6 deletions be/src/util/thrift_rpc_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ Status ThriftRpcHelper::rpc_impl(const std::function<void(ClientConnection<Front
try {
callback(client);
return Status::OK();
} catch (apache::thrift::protocol::TProtocolException& e) {
if (e.getType() == apache::thrift::protocol::TProtocolException::TProtocolExceptionType::INVALID_DATA) {
ss << "FE RPC response parsing failure, address=" << address << ".The FE may be busy, please retry later";
} else {
ss << "FE RPC failure, address=" << address << ", reason=" << e.what();
}
} catch (apache::thrift::TException& e) {
ss << "FE RPC failure, address=" << address << ", reason=" << e.what();
}
Expand Down
4 changes: 2 additions & 2 deletions be/test/util/thrift_rpc_helper_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ TEST_F(ThriftRpcHelperTest, fe_rpc_impl) {
client, addr);
EXPECT_STATUS(Status::ThriftRpcError(""), st);
EXPECT_EQ(
"Rpc error: FE RPC response parsing failure, address=TNetworkAddress(hostname=127.0.0.1, "
"port=9020).The FE may be busy, please retry later",
"Rpc error: FE RPC failure, address=TNetworkAddress(hostname=127.0.0.1, port=9020), reason=invalid "
"TType",
st.to_string());
}
{
Expand Down
Loading