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

fix ret_code in ObDataStoreDesc and accelerate to add compaction progress

Browse Source
This commit is contained in:
obdev
2022-11-08 03:10:25 +00:00
committed by wangzelin.wzl
parent 1500568e5b
commit 06cd51db17
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/compaction/ob_tenant_compaction_progress.cpp
View File

@ -171,7 +171,7 @@ int ObTenantCompactionProgressMgr::loop_major_sstable_(
} else if (ls->is_deleted()) { } else if (ls->is_deleted()) {
// do nothing // do nothing
} else { } else {
ObLSTabletIterator tablet_iter; ObLSTabletIterator tablet_iter(ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US);
const ObLSID &ls_id = ls->get_ls_id(); const ObLSID &ls_id = ls->get_ls_id();
if (OB_FAIL(ls->get_tablet_svr()->build_tablet_iter(tablet_iter))) { if (OB_FAIL(ls->get_tablet_svr()->build_tablet_iter(tablet_iter))) {
LOG_WARN("failed to build ls tablet iter", K(ret), K(ls)); LOG_WARN("failed to build ls tablet iter", K(ret), K(ls));
@ -267,16 +267,10 @@ int ObTenantCompactionProgressMgr::finish_progress_(ObTenantCompactionProgress &
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (share::ObIDag::DAG_STATUS_FINISH != progress.status_) { if (share::ObIDag::DAG_STATUS_FINISH != progress.status_) {
int64_t occupy_size = 0;
progress.unfinished_data_size_ = 0; progress.unfinished_data_size_ = 0;
progress.estimated_finish_time_ = ObTimeUtility::fast_current_time(); progress.estimated_finish_time_ = ObTimeUtility::fast_current_time();
progress.unfinished_tablet_cnt_ = 0; progress.unfinished_tablet_cnt_ = 0;
progress.status_ = share::ObIDag::DAG_STATUS_FINISH; progress.status_ = share::ObIDag::DAG_STATUS_FINISH;
int64_t unused_cnt = 0;
if (OB_FAIL(loop_major_sstable_(progress.merge_version_, true/*equal_flag*/,unused_cnt, progress.data_size_))) {
LOG_WARN("failed to get sstable info", K(ret));
}
} }
return ret; return ret;
} }

3
src/storage/ddl/ob_direct_insert_sstable_ctx.cpp
View File

@ -509,7 +509,8 @@ int ObSSTableInsertTabletContext::prepare_index_builder_if_need(const ObTableSch
ls_handle_.get_ls()->get_ls_id(), ls_handle_.get_ls()->get_ls_id(),
build_param_.tablet_id_, // TODO(shuangcan): confirm this build_param_.tablet_id_, // TODO(shuangcan): confirm this
build_param_.write_major_ ? storage::MAJOR_MERGE : storage::MINOR_MERGE, build_param_.write_major_ ? storage::MAJOR_MERGE : storage::MINOR_MERGE,
1L))) { 1L /*snapshot_version*/,
GET_MIN_CLUSTER_VERSION()))) {
LOG_WARN("fail to init data desc", K(ret)); LOG_WARN("fail to init data desc", K(ret));
} else { } else {
data_desc.row_column_count_ = data_desc.rowkey_column_count_ + 1; data_desc.row_column_count_ = data_desc.rowkey_column_count_ + 1;