From cc9e60b1d0a92b325015607b89d345e55cdd4d92 Mon Sep 17 00:00:00 2001 From: zhjc1124 Date: Tue, 26 Dec 2023 08:48:13 +0000 Subject: [PATCH] alter large_query_threshold value range --- src/observer/omt/ob_th_worker.cpp | 2 +- src/share/parameter/ob_parameter_seed.ipp | 4 ++-- src/sql/ob_sql.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/observer/omt/ob_th_worker.cpp b/src/observer/omt/ob_th_worker.cpp index 9c9cd4737..5cfca08e5 100644 --- a/src/observer/omt/ob_th_worker.cpp +++ b/src/observer/omt/ob_th_worker.cpp @@ -224,7 +224,7 @@ ObThWorker::Status ObThWorker::check_wait() } else if (curr_time > last_check_time_ + WORKER_CHECK_PERIOD) { st = check_throttle(); if (st != WS_OUT_OF_THROTTLE) { - if (OB_UNLIKELY(curr_time > get_query_start_time() + threshold)) { + if (OB_UNLIKELY(0 != threshold && curr_time > get_query_start_time() + threshold)) { tenant_->lq_yield(*this); } } diff --git a/src/share/parameter/ob_parameter_seed.ipp b/src/share/parameter/ob_parameter_seed.ipp index 12d853c8a..2157ce950 100644 --- a/src/share/parameter/ob_parameter_seed.ipp +++ b/src/share/parameter/ob_parameter_seed.ipp @@ -311,9 +311,9 @@ DEF_DBL(large_query_worker_percentage, OB_CLUSTER_PARAMETER, "30", "[0,100]", "the percentage of the workers reserved to serve large query request. " "Range: [0, 100] in percentage", ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)) -DEF_TIME(large_query_threshold, OB_CLUSTER_PARAMETER, "5s", "[1ms,)", +DEF_TIME(large_query_threshold, OB_CLUSTER_PARAMETER, "5s", "[0ms,)", "threshold for execution time beyond " - "which a request may be paused and rescheduled as a \\'large request\\'. Range: [1ms, +∞)", + "which a request may be paused and rescheduled as a \\'large request\\', 0ms means disable \\'large request\\'. Range: [0ms, +∞)", ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); DEF_INT(_ob_max_thread_num, OB_CLUSTER_PARAMETER, "0", "[0,10000)", "ob max thread number " diff --git a/src/sql/ob_sql.cpp b/src/sql/ob_sql.cpp index 2c86add24..298dd665c 100644 --- a/src/sql/ob_sql.cpp +++ b/src/sql/ob_sql.cpp @@ -2599,7 +2599,7 @@ OB_NOINLINE int ObSql::handle_large_query(int tmp_ret, exec_times = plan->stat_.get_execute_count(); total_process_time = plan->stat_.total_process_time_; if (exec_times > 0 - && (total_process_time / exec_times) > lqt) { + && (0 != lqt && (total_process_time / exec_times) > lqt)) { plan->inc_large_querys(); is_large_query = true; lq_from_plan = true; @@ -2609,7 +2609,7 @@ OB_NOINLINE int ObSql::handle_large_query(int tmp_ret, //实际编译时间判断是否为大请求 if (OB_SUCC(ret) && is_large_query == false) { if (OB_PC_LOCK_CONFLICT == tmp_ret - || elapsed_time > lqt) { + || (0 != lqt && elapsed_time > lqt)) { is_large_query = true; lq_from_plan = false; }