hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

modify log level in ddl merge task when ddl kv mgr not exist

Browse Source
This commit is contained in:
simonjoylet
2022-11-08 03:05:41 +00:00
committed by wangzelin.wzl
parent bc9a954129
commit ea6614daff
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/storage/ddl/ob_ddl_merge_task.cpp
View File

@ -105,7 +105,12 @@ int ObDDLTableMergeDag::create_first_task()
ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) { ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) {
LOG_WARN("get tablet failed", K(ret), K(ddl_param_)); LOG_WARN("get tablet failed", K(ret), K(ddl_param_));
} else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) { } else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) {
if (OB_ENTRY_NOT_EXIST == ret) {
ret = OB_TASK_EXPIRED;
LOG_INFO("ddl kv mgr not exist", K(ret), K(ddl_param_));
} else {
LOG_WARN("get ddl kv mgr failed", K(ret), K(ddl_param_)); LOG_WARN("get ddl kv mgr failed", K(ret), K(ddl_param_));
}
} else if (ddl_param_.start_log_ts_ < ddl_kv_mgr_handle.get_obj()->get_start_log_ts()) { } else if (ddl_param_.start_log_ts_ < ddl_kv_mgr_handle.get_obj()->get_start_log_ts()) {
ret = OB_TASK_EXPIRED; ret = OB_TASK_EXPIRED;
LOG_WARN("ddl task expired, skip it", K(ret), K(ddl_param_), "new_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts()); LOG_WARN("ddl task expired, skip it", K(ret), K(ddl_param_), "new_start_log_ts", ddl_kv_mgr_handle.get_obj()->get_start_log_ts());
@ -191,6 +196,13 @@ int ObDDLTableMergeDag::fill_dag_key(char *buf, const int64_t buf_len) const
return ret; return ret;
} }
bool ObDDLTableMergeDag::ignore_warning()
{
return OB_LS_NOT_EXIST == dag_ret_
|| OB_TABLET_NOT_EXIST == dag_ret_
|| OB_TASK_EXPIRED == dag_ret_;
}
/****************** ObDDLTableDumpTask *****************/ /****************** ObDDLTableDumpTask *****************/
ObDDLTableDumpTask::ObDDLTableDumpTask() ObDDLTableDumpTask::ObDDLTableDumpTask()
: ObITask(ObITaskType::TASK_TYPE_DDL_KV_DUMP), : ObITask(ObITaskType::TASK_TYPE_DDL_KV_DUMP),
@ -240,7 +252,12 @@ int ObDDLTableDumpTask::process()
ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) { ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) {
LOG_WARN("failed to get tablet", K(ret), K(tablet_id_)); LOG_WARN("failed to get tablet", K(ret), K(tablet_id_));
} else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) { } else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) {
LOG_WARN("get ddl kv mgr failed", K(ret)); if (OB_ENTRY_NOT_EXIST == ret) {
ret = OB_TASK_EXPIRED;
LOG_INFO("ddl kv mgr not exist", K(ret), K(ls_id_), K(tablet_id_));
} else {
LOG_WARN("get ddl kv mgr failed", K(ret), K(ls_id_), K(tablet_id_));
}
} else { } else {
ObDDLKVHandle ddl_kv_handle; ObDDLKVHandle ddl_kv_handle;
ObDDLKV *ddl_kv = nullptr; ObDDLKV *ddl_kv = nullptr;
@ -316,7 +333,12 @@ int ObDDLTableMergeTask::process()
ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) { ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) {
LOG_WARN("failed to get tablet", K(ret), K(merge_param_)); LOG_WARN("failed to get tablet", K(ret), K(merge_param_));
} else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) { } else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_kv_mgr(ddl_kv_mgr_handle))) {
LOG_WARN("get ddl kv mgr failed", K(ret)); if (OB_ENTRY_NOT_EXIST == ret) {
ret = OB_TASK_EXPIRED;
LOG_INFO("ddl kv mgr not exist", K(ret), K(merge_param_));
} else {
LOG_WARN("get ddl kv mgr failed", K(ret), K(merge_param_));
}
} else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_sstable_handles(ddl_sstable_handles))) { } else if (OB_FAIL(tablet_handle.get_obj()->get_ddl_sstable_handles(ddl_sstable_handles))) {
LOG_WARN("get ddl sstable handles failed", K(ret)); LOG_WARN("get ddl sstable handles failed", K(ret));
} else if (ddl_sstable_handles.get_count() >= MAX_DDL_SSTABLE || merge_param_.is_commit_) { } else if (ddl_sstable_handles.get_count() >= MAX_DDL_SSTABLE || merge_param_.is_commit_) {

1
src/storage/ddl/ob_ddl_merge_task.h
View File

@ -77,6 +77,7 @@ public:
virtual int64_t hash() const override; virtual int64_t hash() const override;
virtual int fill_comment(char *buf, const int64_t buf_len) const override; virtual int fill_comment(char *buf, const int64_t buf_len) const override;
virtual int fill_dag_key(char *buf, const int64_t buf_len) const override; virtual int fill_dag_key(char *buf, const int64_t buf_len) const override;
virtual bool ignore_warning() override;
virtual lib::Worker::CompatMode get_compat_mode() const override virtual lib::Worker::CompatMode get_compat_mode() const override
{ return compat_mode_; } { return compat_mode_; }
private: private: