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

fix core in compaction diagnose

Browse Source
This commit is contained in:
a1iive
2023-07-04 03:42:22 +00:00
committed by ob-robot
parent 2580623c5f
commit 7beca296dc
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/compaction/ob_compaction_diagnose.cpp
View File

@ -855,8 +855,6 @@ int ObCompactionDiagnoseMgr::diagnose_tenant_tablet()
} }
ObLSID ls_id; ObLSID ls_id;
ObLSHandle ls_handle;
ObLS *ls = nullptr;
ObLSCheckStatus ls_check_status; ObLSCheckStatus ls_check_status;
bool tenant_major_finish = true; bool tenant_major_finish = true;
bool tablet_major_finish = true; bool tablet_major_finish = true;
@ -875,7 +873,7 @@ int ObCompactionDiagnoseMgr::diagnose_tenant_tablet()
} else if (OB_FAIL(ls_status_map_.set_refactored(ls_id, ls_check_status))) { } else if (OB_FAIL(ls_status_map_.set_refactored(ls_id, ls_check_status))) {
LOG_WARN("failed to set ls check status", K(ret), K(ls_id), K(ls_check_status)); LOG_WARN("failed to set ls check status", K(ret), K(ls_id), K(ls_check_status));
} else if (!ls_check_status.need_merge_) { } else if (!ls_check_status.need_merge_) {
(void)abnormal_ls_id.push_back(ls->get_ls_id()); (void)abnormal_ls_id.push_back(ls_id);
} }
} else { } else {
LOG_WARN("failed to get ls check status from map", K(ret)); LOG_WARN("failed to get ls check status from map", K(ret));

6
src/storage/compaction/ob_compaction_diagnose.h
View File

@ -536,13 +536,13 @@ private:
int64_t tenant_id = MTL_ID(); \ int64_t tenant_id = MTL_ID(); \
int64_t hash_value = ObScheduleSuspectInfo::gen_hash(tenant_id, dag_hash.inner_hash()); \ int64_t hash_value = ObScheduleSuspectInfo::gen_hash(tenant_id, dag_hash.inner_hash()); \
if (OB_TMP_FAIL(MTL(ObScheduleSuspectInfoMgr *)->delete_info(hash_value))) { \ if (OB_TMP_FAIL(MTL(ObScheduleSuspectInfoMgr *)->delete_info(hash_value))) { \
if (OB_HASH_NOT_EXIST != ret) { \ if (OB_HASH_NOT_EXIST != tmp_ret) { \
STORAGE_LOG(WARN, "failed to add suspect info", K(tmp_ret), K(dag_hash), K(tenant_id)); \ STORAGE_LOG(WARN, "failed to del suspect info", K(tmp_ret), K(dag_hash), K(tenant_id)); \
} else { \ } else { \
tmp_ret = OB_SUCCESS; \ tmp_ret = OB_SUCCESS; \
} \ } \
} else { \ } else { \
STORAGE_LOG(DEBUG, "success to add suspect info", K(tmp_ret), K(dag_hash), K(tenant_id)); \ STORAGE_LOG(DEBUG, "success to del suspect info", K(tmp_ret), K(dag_hash), K(tenant_id)); \
} \ } \
} }