From 781cdf1f311106fa19ea6c1b89238f13623a2f36 Mon Sep 17 00:00:00 2001 From: lmjhh <576788582@qq.com> Date: Thu, 12 Dec 2024 08:44:38 +0000 Subject: [PATCH] fix check job params bug --- .../ob_dbms_sched_job_utils.cpp | 112 +++++++++++------- .../dbms_scheduler/ob_dbms_sched_job_utils.h | 5 +- .../engine/cmd/ob_olap_async_job_executor.cpp | 6 +- 3 files changed, 76 insertions(+), 47 deletions(-) diff --git a/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.cpp b/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.cpp index a6e6e74d4..6eeec8db8 100644 --- a/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.cpp +++ b/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.cpp @@ -73,7 +73,7 @@ int ObDBMSSchedJobUtils::check_is_valid_job_style(const ObString &str) int ObDBMSSchedJobUtils::check_is_valid_argument_num(const int64_t num) { int ret = OB_SUCCESS; - if (0 != num) { + if (0 > num) { ret = OB_NOT_SUPPORTED; } return ret; @@ -124,7 +124,7 @@ int ObDBMSSchedJobUtils::check_is_valid_end_date(const int64_t start_date, const return ret; } -int ObDBMSSchedJobUtils::check_is_valid_repeat_interval(const ObString &str) { +int ObDBMSSchedJobUtils::check_is_valid_repeat_interval(const ObString &str, bool is_limit_interval_num) { int ret = OB_SUCCESS; if (!str.empty() && 0 != str.case_compare("null")) { ObString repeat_expr(str); @@ -132,17 +132,25 @@ int ObDBMSSchedJobUtils::check_is_valid_repeat_interval(const ObString &str) { ObString repeat_type_str = repeat_expr.split_on(';').trim_space_only(); ObString interval_str = repeat_expr.split_on('=').trim_space_only(); ObString repeat_num_str = repeat_expr.trim_space_only(); - if (!repeat_num_str.is_numeric()) { - ret = OB_NOT_SUPPORTED; - } else if (0 >= atoi(repeat_num_str.ptr())) { - ret = OB_NOT_SUPPORTED; - } else if (0 != freq_str.case_compare("FREQ") || 0 != interval_str.case_compare("INTERVAL") || - (0 != repeat_type_str.case_compare("SECONDLY") && 0 != repeat_type_str.case_compare("MINUTELY") && - 0 != repeat_type_str.case_compare("HOURLY") && - 0 != repeat_type_str.case_compare("DAILY") && 0 != repeat_type_str.case_compare("DAYLY") && - 0 != repeat_type_str.case_compare("WEEKLY") && 0 != repeat_type_str.case_compare("MONTHLY") && - 0 != repeat_type_str.case_compare("YEARLY"))) { + const int MAX_REPTAT_NUM_LEN = 16; + if (!repeat_num_str.is_numeric() || MAX_REPTAT_NUM_LEN <= repeat_num_str.length()) { ret = OB_NOT_SUPPORTED; + } else { + char repeat_num_buf[MAX_REPTAT_NUM_LEN]; + int64_t pos = repeat_num_str.to_string(repeat_num_buf, MAX_REPTAT_NUM_LEN); + int64_t repeat_num = atoi(repeat_num_buf); + if (0 >= repeat_num) { + ret = OB_NOT_SUPPORTED; + } else if (is_limit_interval_num && 8000 <= repeat_num) { + ret = OB_INVALID_ARGUMENT_NUM; + } else if (0 != freq_str.case_compare("FREQ") || 0 != interval_str.case_compare("INTERVAL") || + (0 != repeat_type_str.case_compare("SECONDLY") && 0 != repeat_type_str.case_compare("MINUTELY") && + 0 != repeat_type_str.case_compare("HOURLY") && + 0 != repeat_type_str.case_compare("DAILY") && 0 != repeat_type_str.case_compare("DAYLY") && + 0 != repeat_type_str.case_compare("WEEKLY") && 0 != repeat_type_str.case_compare("MONTHLY") && + 0 != repeat_type_str.case_compare("YEARLY"))) { + ret = OB_NOT_SUPPORTED; + } } } return ret; @@ -308,7 +316,12 @@ int ObDBMSSchedJobUtils::stop_dbms_sched_job( } } while (OB_SUCC(ret)); if (OB_ITER_END == ret) { + if (result_empty) { + ret = OB_ENTRY_NOT_EXIST; + LOG_WARN("no running job", K(ret), K(tenant_id), K(job_info.job_name_)); + } else { ret = OB_SUCCESS; + } } } } @@ -362,7 +375,7 @@ int ObDBMSSchedJobUtils::create_dbms_sched_job( int ret = OB_SUCCESS; bool is_oracle_tenant = lib::is_oracle_mode(); //chcek job name - if (job_info.job_name_.empty() || OB_FAIL(check_is_valid_name(job_info.job_name_))) { + if (job_info.job_name_.empty() || OB_FAIL(check_is_valid_name(job_info.job_name_)) || 0 == (job_info.job_name_.case_compare("__dummy_guard"))) { ret = OB_INVALID_ARGUMENT; //check job style } else if (job_info.job_style_.empty() || OB_FAIL(check_is_valid_job_style(job_info.job_style_))) { @@ -504,7 +517,7 @@ int ObDBMSSchedJobUtils::update_dbms_sched_job_info(common::ObISQLClient &sql_cl } else if (0 == job_attribute_name.case_compare("enabled")) { if (OB_FAIL(dml.add_column("enabled", job_attribute_value.get_bool()))) { LOG_WARN("add column failed", KR(ret), K(job_attribute_value.get_bool())); - } else if (job_info.state_.case_compare("BROKEN")) { + } else if (job_attribute_value.get_bool() && job_info.state_.case_compare("BROKEN")) { if (OB_FAIL(dml.add_column("state", "SCHEDULED"))) { LOG_WARN("add state column failed", KR(ret), K(job_info.state_)); } else if (OB_FAIL(dml.add_column("failures", 0))) { @@ -649,7 +662,11 @@ int ObDBMSSchedJobUtils::calc_dbms_sched_repeat_expr(const ObDBMSSchedJobInfo &j int64_t N = (now - job_info.start_date_) / job_info.interval_ts_; next_run_time = job_info.start_date_ + (N + 1) * job_info.interval_ts_; } else if (job_info.repeat_interval_.empty() || 0 == job_info.repeat_interval_.case_compare("null")) { - next_run_time = ObDBMSSchedJobInfo::DEFAULT_MAX_END_DATE; + if (now < job_info.start_date_) { //job 未开始 + next_run_time = job_info.start_date_; + } else { + next_run_time = ObDBMSSchedJobInfo::DEFAULT_MAX_END_DATE; + } } else { ObString repeat_expr(job_info.repeat_interval_); ObString freq_str = repeat_expr.split_on('=').trim_space_only(); @@ -657,38 +674,45 @@ int ObDBMSSchedJobUtils::calc_dbms_sched_repeat_expr(const ObDBMSSchedJobInfo &j ObString interval_str = repeat_expr.split_on('=').trim_space_only(); ObString repeat_num_str = repeat_expr.trim_space_only(); - if (!repeat_num_str.is_numeric() || 0 >= atoi(repeat_num_str.ptr())) { //未加参数检查前的 job 可能会有这种错误 - next_run_time = ObDBMSSchedJobInfo::DEFAULT_MAX_END_DATE; + const int MAX_REPTAT_NUM_LEN = 16; + if (!repeat_num_str.is_numeric() || MAX_REPTAT_NUM_LEN <= repeat_num_str.length()) { + next_run_time = ObDBMSSchedJobInfo::DEFAULT_MAX_END_DATE; //非数字/数字太大 } else { - if (0 != freq_str.case_compare("FREQ")) { - ret = OB_NOT_SUPPORTED; - } else if (0 != interval_str.case_compare("INTERVAL")) { - ret = OB_NOT_SUPPORTED; - } else if (0 == repeat_type_str.case_compare("SECONDLY")) { - freq_num = 1; - } else if (0 == repeat_type_str.case_compare("MINUTELY")) { - freq_num = 60; - } else if (0 == repeat_type_str.case_compare("HOURLY")) { - freq_num = 60 * 60; - } else if (0 == repeat_type_str.case_compare("DAILY") || 0 == repeat_type_str.case_compare("DAYLY")) { - freq_num = 24 * 60 * 60; - } else if (0 == repeat_type_str.case_compare("WEEKLY")) { - freq_num = 7 * 24 * 60 * 60; - } else if (0 == repeat_type_str.case_compare("MONTHLY")) { - freq_num = 30 * 24 * 60 * 60; - } else if (0 == repeat_type_str.case_compare("YEARLY")) { - freq_num = 12 * 30 * 24 * 60 * 60; + char repeat_num_buf[MAX_REPTAT_NUM_LEN]; + int64_t pos = repeat_num_str.to_string(repeat_num_buf, MAX_REPTAT_NUM_LEN); + repeat_num = atoi(repeat_num_buf); + if (0 >= repeat_num) { //未加参数检查前的 job 可能会有这种错误 + next_run_time = ObDBMSSchedJobInfo::DEFAULT_MAX_END_DATE; } else { - ret = OB_NOT_SUPPORTED; - } + if (0 != freq_str.case_compare("FREQ")) { + ret = OB_NOT_SUPPORTED; + } else if (0 != interval_str.case_compare("INTERVAL")) { + ret = OB_NOT_SUPPORTED; + } else if (0 == repeat_type_str.case_compare("SECONDLY")) { + freq_num = 1; + } else if (0 == repeat_type_str.case_compare("MINUTELY")) { + freq_num = 60; + } else if (0 == repeat_type_str.case_compare("HOURLY")) { + freq_num = 60 * 60; + } else if (0 == repeat_type_str.case_compare("DAILY") || 0 == repeat_type_str.case_compare("DAYLY")) { + freq_num = 24 * 60 * 60; + } else if (0 == repeat_type_str.case_compare("WEEKLY")) { + freq_num = 7 * 24 * 60 * 60; + } else if (0 == repeat_type_str.case_compare("MONTHLY")) { + freq_num = 30 * 24 * 60 * 60; + } else if (0 == repeat_type_str.case_compare("YEARLY")) { + freq_num = 12 * 30 * 24 * 60 * 60; + } else { + ret = OB_NOT_SUPPORTED; + } - if (OB_SUCC(ret)) { - repeat_num = atoi(repeat_num_str.ptr()); - int64_t repeat_interval_ts = freq_num * repeat_num * 1000000LL; - int64_t N = (now - job_info.start_date_) / repeat_interval_ts; - next_run_time = job_info.start_date_ + (N + 1) * repeat_interval_ts; - //未开始执行时，重新计算下次执行时间应该还是 start_date - next_run_time = max(next_run_time, job_info.start_date_); + if (OB_SUCC(ret)) { + int64_t repeat_interval_ts = freq_num * repeat_num * 1000000LL; + int64_t N = (now - job_info.start_date_) / repeat_interval_ts; + next_run_time = job_info.start_date_ + (N + 1) * repeat_interval_ts; + //未开始执行时，重新计算下次执行时间应该还是 start_date + next_run_time = max(next_run_time, job_info.start_date_); + } } } } diff --git a/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.h b/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.h index ea83f0bda..cf07b50cd 100644 --- a/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.h +++ b/src/observer/dbms_scheduler/ob_dbms_sched_job_utils.h @@ -429,12 +429,13 @@ public: * @retval OB_SUCCESS execute success * @retval OB_NOT_SUPPORTED 不支持 */ - static int check_is_valid_repeat_interval(const ObString &str); + static int check_is_valid_repeat_interval(const ObString &str, bool is_limit_interval_num = false); /** * @brief 检查是否有效的 max_run_duration * @param [in] max_run_duration * @retval OB_SUCCESS execute success - * @retval OB_NOT_SUPPORTED 不支持 + * @retval OB_INVALID_ARGUMENT_NUM interval_num 超出范围 + * @retval OB_NOT_SUPPORTED 语法不支持 */ static int check_is_valid_max_run_duration(const int64_t max_run_duration); diff --git a/src/sql/engine/cmd/ob_olap_async_job_executor.cpp b/src/sql/engine/cmd/ob_olap_async_job_executor.cpp index a8dc68196..723985cb6 100644 --- a/src/sql/engine/cmd/ob_olap_async_job_executor.cpp +++ b/src/sql/engine/cmd/ob_olap_async_job_executor.cpp @@ -57,7 +57,11 @@ int ObOLAPAsyncCancelJobExecutor::execute(ObExecContext &ctx, ObOLAPAsyncCancelJ } else if (OB_FAIL(dbms_scheduler::ObDBMSSchedJobUtils::check_dbms_sched_job_priv(user_info, job_info))) { LOG_WARN("check user priv failed", KR(ret), K(tenant_id), K(job_info)); } else if (OB_FAIL(dbms_scheduler::ObDBMSSchedJobUtils::stop_dbms_sched_job(*GCTX.sql_proxy_, job_info, true /* delete after stop */))) { - LOG_WARN("failed to stop dbms scheduler job", KR(ret)); + if (OB_ENTRY_NOT_EXIST == ret) {//当前job_不在运行不需要报错 + ret = OB_SUCCESS; + } else { + LOG_WARN("failed to stop dbms scheduler job", KR(ret)); + } } return ret; }