database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](rpc) fix BE crash in SendRpcResponse when high concurrency (#7413)

Browse Source 
The response is accessed when done->Run is called in transmit_data(),
give response a default value to avoid null pointers in high concurrency.
This commit is contained in:
Xinyi Zou
2021-12-16 20:27:24 +08:00
committed by GitHub
parent c873c8c162
commit 7d4da7af5c
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
be/src/service/internal_service.cpp
View File

@ -62,14 +62,18 @@ void PInternalServiceImpl<T>::transmit_data(google::protobuf::RpcController* cnt
<< " node=" << request->node_id();
brpc::Controller* cntl = static_cast<brpc::Controller*>(cntl_base);
attachment_transfer_request_row_batch<PTransmitDataParams>(request, cntl);
auto st = _exec_env->stream_mgr()->transmit_data(request, &done);
// The response is accessed when done->Run is called in transmit_data(),
// give response a default value to avoid null pointers in high concurrency.
Status st;
st.to_protobuf(response->mutable_status());
st = _exec_env->stream_mgr()->transmit_data(request, &done);
if (!st.ok()) {
LOG(WARNING) << "transmit_data failed, message=" << st.get_error_msg()
<< ", fragment_instance_id=" << print_id(request->finst_id())
<< ", node=" << request->node_id();
}
st.to_protobuf(response->mutable_status());
if (done != nullptr) {
st.to_protobuf(response->mutable_status());
done->Run();
}
}

12
be/src/util/proto_util.h
View File

@ -27,11 +27,11 @@ inline void request_row_batch_transfer_attachment(Params* brpc_request, Closure*
if (brpc_request->has_row_batch() && config::transfer_data_by_brpc_attachment == true) {
butil::IOBuf attachment;
auto row_batch = brpc_request->mutable_row_batch();
row_batch->set_transfer_by_attachment(true);
attachment.append(row_batch->tuple_data());
row_batch->clear_tuple_data();
row_batch->set_tuple_data("");
closure->cntl.request_attachment().swap(attachment);
brpc_request->set_transfer_by_attachment(true);
}
}
@ -40,13 +40,11 @@ template <typename Params>
inline void attachment_transfer_request_row_batch(const Params* brpc_request,
brpc::Controller* cntl) {
Params* req = const_cast<Params*>(brpc_request);
if (req->has_row_batch()) {
if (req->has_row_batch() && req->transfer_by_attachment()) {
auto rb = req->mutable_row_batch();
if (rb->transfer_by_attachment()) {
DCHECK(cntl->request_attachment().size() > 0);
const butil::IOBuf& io_buf = cntl->request_attachment();
io_buf.copy_to(rb->mutable_tuple_data(), io_buf.size(), 0);
}
DCHECK(cntl->request_attachment().size() > 0);
const butil::IOBuf& io_buf = cntl->request_attachment();
io_buf.copy_to(rb->mutable_tuple_data(), io_buf.size(), 0);
}
}

1
gensrc/proto/data.proto
View File

@ -40,7 +40,6 @@ message PRowBatch {
repeated int32 tuple_offsets = 3;
required bytes tuple_data = 4;
required bool is_compressed = 5;
optional bool transfer_by_attachment = 6 [default = false];
}
message PColumn {

4
gensrc/proto/internal_service.proto
View File

@ -45,6 +45,8 @@ message PTransmitDataParams {
optional PQueryStatistics query_statistics = 8;
optional PBlock block = 9;
// transfer the RowBatch to the Controller Attachment
optional bool transfer_by_attachment = 10 [default = false];
};
message PTransmitDataResult {
@ -96,6 +98,8 @@ message PTabletWriterAddBatchRequest {
repeated int64 partition_ids = 8;
// the backend which send this request
optional int64 backend_id = 9 [default = -1];
// transfer the RowBatch to the Controller Attachment
optional bool transfer_by_attachment = 10 [default = false];
};
message PTabletWriterAddBatchResult {