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.

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

[Chore](runtime-filter) enlarge sync filter size rpc timeout limit #37103

Merged
merged 2 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/common/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ DEFINE_Int32(doris_scanner_thread_pool_queue_size, "102400");
// default thrift client connect timeout(in seconds)
DEFINE_mInt32(thrift_connect_timeout_seconds, "3");
DEFINE_mInt32(fetch_rpc_timeout_seconds, "30");

// default thrift client retry interval (in milliseconds)
DEFINE_mInt64(thrift_client_retry_interval_ms, "1000");
// max message size of thrift request
Expand Down
4 changes: 2 additions & 2 deletions be/src/exprs/runtime_filter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@ class SyncSizeClosure : public AutoReleaseClosure<PSendFilterSizeRequest,
: Base(req, callback), _dependency(std::move(dependency)) {}
};

Status IRuntimeFilter::send_filter_size(uint64_t local_filter_size) {
Status IRuntimeFilter::send_filter_size(RuntimeState* state, uint64_t local_filter_size) {
DCHECK(is_producer());

if (_need_local_merge) {
Expand Down Expand Up @@ -1105,7 +1105,7 @@ Status IRuntimeFilter::send_filter_size(uint64_t local_filter_size) {

request->set_filter_size(local_filter_size);
request->set_filter_id(_filter_id);
callback->cntl_->set_timeout_ms(wait_time_ms());
callback->cntl_->set_timeout_ms(std::min(3600, state->execution_timeout()) * 1000);

stub->send_filter_size(closure->cntl_.get(), closure->request_.get(), closure->response_.get(),
closure.get());
Expand Down
2 changes: 1 addition & 1 deletion be/src/exprs/runtime_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ class IRuntimeFilter {
// push filter to remote node or push down it to scan_node
Status publish(bool publish_local = false);

Status send_filter_size(uint64_t local_filter_size);
Status send_filter_size(RuntimeState* state, uint64_t local_filter_size);

RuntimeFilterType type() const { return _runtime_filter_type; }

Expand Down
2 changes: 1 addition & 1 deletion be/src/exprs/runtime_filter_slots.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class VRuntimeFilterSlots {
// send_filter_size may call dependency->sub(), so we call set_dependency firstly for all rf to avoid dependency set_ready repeatedly
for (auto* runtime_filter : _runtime_filters) {
if (runtime_filter->need_sync_filter_size()) {
RETURN_IF_ERROR(runtime_filter->send_filter_size(hash_table_size));
RETURN_IF_ERROR(runtime_filter->send_filter_size(state, hash_table_size));
}
}
return Status::OK();
Expand Down
1 change: 1 addition & 0 deletions regression-test/suites/query_p0/join/test_join5.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.

suite("test_join5", "query,p0") {
sql "set runtime_filter_wait_time_ms = 5"
def DBname = "regression_test_join5"
sql "DROP DATABASE IF EXISTS ${DBname}"
sql "CREATE DATABASE IF NOT EXISTS ${DBname}"
Expand Down
Loading