This is an automated email from the ASF dual-hosted git repository.
caiconghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 332ba4c [config] use thrift_rpc_timeout_ms config replace hard code
value (#6637)
332ba4c is described below
commit 332ba4cdedad7d431b258744bbf7369d2bff0399
Author: Zhengguo Yang <yangz...@gmail.com>
AuthorDate: Thu Sep 16 10:22:57 2021 +0800
[config] use thrift_rpc_timeout_ms config replace hard code value (#6637)
use thrift_rpc_timeout_ms config to replace hard code value
---
be/src/common/config.h | 5 +++--
be/src/exec/broker_reader.cpp | 9 ++++++---
be/src/exec/broker_writer.cpp | 6 ++++--
be/src/runtime/broker_mgr.cpp | 4 ++--
be/src/util/broker_storage_backend.cpp | 12 ++++++++----
5 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/be/src/common/config.h b/be/src/common/config.h
index 27bc013..a7d1847 100644
--- a/be/src/common/config.h
+++ b/be/src/common/config.h
@@ -472,7 +472,7 @@
CONF_mInt32(priority_queue_remaining_tasks_increased_frequency, "512");
CONF_mBool(sync_tablet_meta, "false");
// default thrift rpc timeout ms
-CONF_mInt32(thrift_rpc_timeout_ms, "5000");
+CONF_mInt32(thrift_rpc_timeout_ms, "10000");
// txn commit rpc timeout
CONF_mInt32(txn_commit_rpc_timeout_ms, "10000");
@@ -625,7 +625,8 @@ CONF_mBool(runtime_filter_use_async_rpc, "true");
// The value set by the user for send_batch_parallelism is not allowed to
exceed max_send_batch_parallelism_per_job,
// if exceed, the value of send_batch_parallelism would be
max_send_batch_parallelism_per_job
CONF_mInt32(max_send_batch_parallelism_per_job, "5");
-CONF_Validator(max_send_batch_parallelism_per_job, [](const int config) ->
bool { return config >= 1; });
+CONF_Validator(max_send_batch_parallelism_per_job,
+ [](const int config) -> bool { return config >= 1; });
// number of send batch thread pool size
CONF_Int32(send_batch_thread_pool_thread_num, "64");
diff --git a/be/src/exec/broker_reader.cpp b/be/src/exec/broker_reader.cpp
index 65d601a..ab78b5c 100644
--- a/be/src/exec/broker_reader.cpp
+++ b/be/src/exec/broker_reader.cpp
@@ -81,7 +81,8 @@ Status BrokerReader::open() {
TBrokerOpenReaderResponse response;
try {
Status status;
- BrokerServiceConnection client(client_cache(_env), broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), broker_addr,
+ config::thrift_rpc_timeout_ms, &status);
if (!status.ok()) {
LOG(WARNING) << "Create broker client failed. broker=" <<
broker_addr
<< ", status=" << status.get_error_msg();
@@ -148,7 +149,8 @@ Status BrokerReader::readat(int64_t position, int64_t
nbytes, int64_t* bytes_rea
TBrokerReadResponse response;
try {
Status status;
- BrokerServiceConnection client(client_cache(_env), broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), broker_addr,
+ config::thrift_rpc_timeout_ms, &status);
if (!status.ok()) {
LOG(WARNING) << "Create broker client failed. broker=" <<
broker_addr
<< ", status=" << status.get_error_msg();
@@ -222,7 +224,8 @@ void BrokerReader::close() {
TBrokerOperationStatus response;
try {
Status status;
- BrokerServiceConnection client(client_cache(_env), broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), broker_addr,
+ config::thrift_rpc_timeout_ms, &status);
if (!status.ok()) {
LOG(WARNING) << "Create broker client failed. broker=" <<
broker_addr
<< ", status=" << status.get_error_msg();
diff --git a/be/src/exec/broker_writer.cpp b/be/src/exec/broker_writer.cpp
index 40a711a..58f9dd4 100644
--- a/be/src/exec/broker_writer.cpp
+++ b/be/src/exec/broker_writer.cpp
@@ -80,7 +80,8 @@ Status BrokerWriter::open() {
TBrokerOpenWriterResponse response;
try {
Status status;
- BrokerServiceConnection client(client_cache(_env), broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), broker_addr,
+ config::thrift_rpc_timeout_ms, &status);
if (!status.ok()) {
LOG(WARNING) << "Create broker writer client failed. "
<< "broker=" << broker_addr << ", status=" <<
status.get_error_msg();
@@ -134,7 +135,8 @@ Status BrokerWriter::write(const uint8_t* buf, size_t
buf_len, size_t* written_l
TBrokerOperationStatus response;
try {
Status status;
- BrokerServiceConnection client(client_cache(_env), broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), broker_addr,
+ config::thrift_rpc_timeout_ms, &status);
if (!status.ok()) {
LOG(WARNING) << "Create broker write client failed. "
<< "broker=" << broker_addr << ", status=" <<
status.get_error_msg();
diff --git a/be/src/runtime/broker_mgr.cpp b/be/src/runtime/broker_mgr.cpp
index 6e09b1f..220ce1a 100644
--- a/be/src/runtime/broker_mgr.cpp
+++ b/be/src/runtime/broker_mgr.cpp
@@ -72,8 +72,8 @@ void BrokerMgr::ping(const TNetworkAddress& addr) {
TBrokerOperationStatus response;
try {
Status status;
- // 500ms is enough
- BrokerServiceConnection client(_exec_env->broker_client_cache(), addr,
500, &status);
+ BrokerServiceConnection client(_exec_env->broker_client_cache(), addr,
+ config::thrift_rpc_timeout_ms, &status);
if (!status.ok()) {
LOG(WARNING) << "Create broker client failed. broker=" << addr
<< ", status=" << status.get_error_msg();
diff --git a/be/src/util/broker_storage_backend.cpp
b/be/src/util/broker_storage_backend.cpp
index f97798e..1b5dd0e 100644
--- a/be/src/util/broker_storage_backend.cpp
+++ b/be/src/util/broker_storage_backend.cpp
@@ -145,7 +145,8 @@ Status BrokerStorageBackend::upload(const std::string&
local, const std::string&
Status BrokerStorageBackend::rename(const std::string& orig_name, const
std::string& new_name) {
Status status = Status::OK();
- BrokerServiceConnection client(client_cache(_env), _broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), _broker_addr,
config::thrift_rpc_timeout_ms,
+ &status);
if (!status.ok()) {
std::stringstream ss;
ss << "failed to get broker client. "
@@ -190,7 +191,8 @@ Status BrokerStorageBackend::rename(const std::string&
orig_name, const std::str
Status BrokerStorageBackend::list(const std::string& remote_path,
std::map<std::string, FileStat>* files) {
Status status = Status::OK();
- BrokerServiceConnection client(client_cache(_env), _broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), _broker_addr,
config::thrift_rpc_timeout_ms,
+ &status);
if (!status.ok()) {
std::stringstream ss;
ss << "failed to get broker client. "
@@ -275,7 +277,8 @@ Status BrokerStorageBackend::direct_upload(const
std::string& remote, const std:
Status BrokerStorageBackend::rm(const std::string& remote) {
Status status = Status::OK();
- BrokerServiceConnection client(client_cache(_env), _broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), _broker_addr,
config::thrift_rpc_timeout_ms,
+ &status);
if (!status.ok()) {
std::stringstream ss;
ss << "failed to get broker client. "
@@ -324,7 +327,8 @@ Status BrokerStorageBackend::mkdir(const std::string& path)
{
Status BrokerStorageBackend::exist(const std::string& path) {
Status status = Status::OK();
- BrokerServiceConnection client(client_cache(_env), _broker_addr, 10000,
&status);
+ BrokerServiceConnection client(client_cache(_env), _broker_addr,
config::thrift_rpc_timeout_ms,
+ &status);
if (!status.ok()) {
std::stringstream ss;
ss << "failed to get broker client. "
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
