Skip to content

Set timeout ts of rpc request to 1 minute #117

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
lzxddz merged 3 commits into from
Oct 27, 2025
Merged

Set timeout ts of rpc request to 1 minute #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b51e74
change rpc timeout ts to 60s
lzxddz Oct 23, 2025
af9d4bd
update log content
lzxddz Oct 24, 2025
3e0ae87
update
lzxddz Oct 24, 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: 9 additions & 7 deletions data_store_service_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ bool DataStoreServiceClient::PersistKV(
<< callback_data->Result().error_msg();
return false;
}
DLOG(INFO) << "DataStoreHandler::PersistKV success.";
LOG(INFO) << "DataStoreHandler::PersistKV success.";

return true;
}
Expand Down Expand Up @@ -3213,7 +3213,7 @@ void DataStoreServiceClient::ReadInternal(ReadClosure *read_closure)

EloqDS::remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *read_closure->Controller();
cntl.set_timeout_ms(5000);
cntl.set_timeout_ms(60000);
auto *req = read_closure->ReadRequest();
auto *resp = read_closure->ReadResponse();
stub.Read(&cntl, req, resp, read_closure);
Expand Down Expand Up @@ -3266,7 +3266,7 @@ void DataStoreServiceClient::DeleteRangeInternal(

EloqDS::remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *delete_range_clouse->Controller();
cntl.set_timeout_ms(5000);
cntl.set_timeout_ms(60000);
auto *req = delete_range_clouse->DeleteRangeRequest();
auto *resp = delete_range_clouse->DeleteRangeResponse();
stub.DeleteRange(&cntl, req, resp, delete_range_clouse);
Expand Down Expand Up @@ -3315,7 +3315,7 @@ void DataStoreServiceClient::FlushDataInternal(

EloqDS::remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *flush_data_closure->Controller();
cntl.set_timeout_ms(5000);
cntl.set_timeout_ms(60000);
auto *req = flush_data_closure->FlushDataRequest();
auto *resp = flush_data_closure->FlushDataResponse();
stub.FlushData(&cntl, req, resp, flush_data_closure);
Expand Down Expand Up @@ -3366,7 +3366,7 @@ void DataStoreServiceClient::DropTableInternal(

EloqDS::remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *drop_table_closure->Controller();
cntl.set_timeout_ms(5000);
cntl.set_timeout_ms(60000);
auto *req = drop_table_closure->DropTableRequest();
auto *resp = drop_table_closure->DropTableResponse();
stub.DropTable(&cntl, req, resp, drop_table_closure);
Expand Down Expand Up @@ -3435,7 +3435,7 @@ void DataStoreServiceClient::ScanNextInternal(

EloqDS::remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *scan_next_closure->Controller();
cntl.set_timeout_ms(5000);
cntl.set_timeout_ms(60000);
auto *req = scan_next_closure->ScanNextRequest();
auto *resp = scan_next_closure->ScanNextResponse();
stub.ScanNext(&cntl, req, resp, scan_next_closure);
Expand Down Expand Up @@ -3487,7 +3487,7 @@ void DataStoreServiceClient::ScanCloseInternal(

EloqDS::remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *scan_next_closure->Controller();
cntl.set_timeout_ms(5000);
cntl.set_timeout_ms(60000);
auto *req = scan_next_closure->ScanNextRequest();
auto *resp = scan_next_closure->ScanNextResponse();
stub.ScanClose(&cntl, req, resp, scan_next_closure);
Expand Down Expand Up @@ -3806,6 +3806,8 @@ void DataStoreServiceClient::BatchWriteRecordsInternal(

// send request
remote::DataStoreRpcService_Stub stub(channel);
brpc::Controller &cntl = *closure->Controller();
cntl.set_timeout_ms(60000);
stub.BatchWriteRecords(closure->Controller(),
closure->RemoteRequest(),
closure->RemoteResponse(),
Expand Down
4 changes: 2 additions & 2 deletions data_store_service_client_closure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ class FlushDataClosure : public ::google::protobuf::Closure, public Poolable
if (cntl_.Failed())
{
// RPC failed.
LOG(ERROR) << "Failed for DeleteRange RPC request "
LOG(ERROR) << "Failed for FlushData RPC request "
<< ", with Error code: " << cntl_.ErrorCode()
<< ". Error Msg: " << cntl_.ErrorText();
if (cntl_.ErrorCode() != brpc::EOVERCROWDED &&
Expand Down Expand Up @@ -1725,7 +1725,7 @@ class BatchWriteRecordsClosure : public ::google::protobuf::Closure,
}
}

if (need_retry && retry_count_ < 2)
if (need_retry && retry_count_ < ds_service_client_->retry_limit_)
{
self_guard.Release();
retry_count_++;
Expand Down