Skip to content

branch-3.0 [enhance](meta-service) add real request ip for be rpc #53114. #53320

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
dataroaring merged 1 commit into from
Jul 17, 2025
Merged

branch-3.0 [enhance](meta-service) add real request ip for be rpc #53114. #53320

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
2 changes: 2 additions & 0 deletions be/src/cloud/cloud_meta_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ Status retry_rpc(std::string_view op_name, const Request& req, Response* res,
static_assert(std::is_base_of_v<::google::protobuf::Message, Request>);
static_assert(std::is_base_of_v<::google::protobuf::Message, Response>);

const_cast<Request&>(req).set_request_ip(BackendOptions::get_be_endpoint());

int retry_times = 0;
uint32_t duration_ms = 0;
std::string error_msg;
Expand Down
51 changes: 30 additions & 21 deletions cloud/src/meta-service/meta_service_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,35 +97,44 @@ inline std::string encryt_sk(std::string debug_string) {
template <class Request>
void begin_rpc(std::string_view func_name, brpc::Controller* ctrl, const Request* req) {
if constexpr (std::is_same_v<Request, CreateRowsetRequest>) {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side();
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip();
} else if constexpr (std::is_same_v<Request, CreateTabletsRequest>) {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side();
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip();
} else if constexpr (std::is_same_v<Request, UpdateDeleteBitmapRequest>) {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side()
<< " table_id=" << req->table_id() << " tablet_id=" << req->tablet_id()
<< " lock_id=" << req->lock_id() << " initiator=" << req->initiator()
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip() << " table_id=" << req->table_id()
<< " tablet_id=" << req->tablet_id() << " lock_id=" << req->lock_id()
<< " initiator=" << req->initiator()
<< " delete_bitmap_size=" << req->segment_delete_bitmaps_size();
} else if constexpr (std::is_same_v<Request, GetDeleteBitmapRequest>) {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip()
<< " tablet_id=" << req->tablet_id() << " rowset_size=" << req->rowset_ids_size();
} else if constexpr (std::is_same_v<Request, GetTabletStatsRequest>) {
VLOG_DEBUG << "begin " << func_name << " from " << ctrl->remote_side()
VLOG_DEBUG << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip()
<< " tablet size: " << req->tablet_idx().size();
} else if constexpr (std::is_same_v<Request, GetVersionRequest> ||
std::is_same_v<Request, GetRowsetRequest> ||
std::is_same_v<Request, GetTabletRequest>) {
VLOG_DEBUG << "begin " << func_name << " from " << ctrl->remote_side()
VLOG_DEBUG << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip()
<< " request=" << req->ShortDebugString();
} else if constexpr (std::is_same_v<Request, RemoveDeleteBitmapRequest>) {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip()
<< " tablet_id=" << req->tablet_id() << " rowset_size=" << req->rowset_ids_size();
} else if constexpr (std::is_same_v<Request, GetDeleteBitmapUpdateLockRequest>) {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side()
<< " table_id=" << req->table_id() << " lock_id=" << req->lock_id()
<< " initiator=" << req->initiator() << " expiration=" << req->expiration()
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip() << " table_id=" << req->table_id()
<< " lock_id=" << req->lock_id() << " initiator=" << req->initiator()
<< " expiration=" << req->expiration()
<< " require_compaction_stats=" << req->require_compaction_stats();
} else {
LOG(INFO) << "begin " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "begin " << func_name << " remote caller: " << ctrl->remote_side()
<< " original client ip: " << req->request_ip()
<< " request=" << req->ShortDebugString();
}
}
Expand All @@ -138,21 +147,21 @@ void finish_rpc(std::string_view func_name, brpc::Controller* ctrl, Response* re
res->clear_partition_ids();
res->clear_versions();
}
LOG(INFO) << "finish " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " response=" << res->ShortDebugString();
} else if constexpr (std::is_same_v<Response, GetRowsetResponse>) {
if (res->status().code() != MetaServiceCode::OK) {
res->clear_rowset_meta();
}
VLOG_DEBUG << "finish " << func_name << " from " << ctrl->remote_side()
VLOG_DEBUG << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " status=" << res->status().ShortDebugString();
} else if constexpr (std::is_same_v<Response, GetTabletStatsResponse>) {
VLOG_DEBUG << "finish " << func_name << " from " << ctrl->remote_side()
VLOG_DEBUG << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " status=" << res->status().ShortDebugString()
<< " tablet size: " << res->tablet_stats().size();
} else if constexpr (std::is_same_v<Response, GetVersionResponse> ||
std::is_same_v<Response, GetTabletResponse>) {
VLOG_DEBUG << "finish " << func_name << " from " << ctrl->remote_side()
VLOG_DEBUG << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " response=" << res->ShortDebugString();
} else if constexpr (std::is_same_v<Response, GetDeleteBitmapResponse>) {
if (res->status().code() != MetaServiceCode::OK) {
Expand All @@ -161,7 +170,7 @@ void finish_rpc(std::string_view func_name, brpc::Controller* ctrl, Response* re
res->clear_versions();
res->clear_segment_delete_bitmaps();
}
LOG(INFO) << "finish " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " status=" << res->status().ShortDebugString()
<< " tablet=" << res->tablet_id()
<< " delete_bitmap_count=" << res->segment_delete_bitmaps_size();
Expand All @@ -171,16 +180,16 @@ void finish_rpc(std::string_view func_name, brpc::Controller* ctrl, Response* re
res->clear_cumulative_compaction_cnts();
res->clear_cumulative_points();
}
LOG(INFO) << "finish " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " status=" << res->status().ShortDebugString();
} else if constexpr (std::is_same_v<Response, GetObjStoreInfoResponse> ||
std::is_same_v<Response, GetStageResponse>) {
std::string debug_string = encryt_sk(res->DebugString());
TEST_SYNC_POINT_CALLBACK("sk_finish_rpc", &debug_string);
LOG(INFO) << "finish " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " response=" << debug_string;
} else {
LOG(INFO) << "finish " << func_name << " from " << ctrl->remote_side()
LOG(INFO) << "finish " << func_name << " remote caller: " << ctrl->remote_side()
<< " response=" << res->ShortDebugString();
}
}
Expand Down
Loading
Loading