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

[4.x] fix two bug in binding_info

Browse Source
This commit is contained in:
obdev
2022-12-06 04:40:41 +00:00
committed by ob-robot
parent 1f4e731da8
commit 237b9e6734
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/tablet/ob_tablet.h
View File

@ -794,8 +794,9 @@ int ObTablet::save_multi_source_data_unit(
TRANS_LOG(WARN, "failed to save multi source data unit", K(ret), K(ls_id), K(tablet_id), K(memtable_scn), K(ref_op));
}
}
// for tx_end, binding_info must be prepared after tablet_state is prepared
else if (memtable::MultiSourceDataUnitType::TABLET_BINDING_INFO == msd->type()) {
// for tx_end(inf_ref), binding_info must be prepared after tablet_state is prepared
else if (memtable::MemtableRefOp::INC_REF == ref_op
&& memtable::MultiSourceDataUnitType::TABLET_BINDING_INFO == msd->type()) {
memtable::ObMemtable *memtable = nullptr;
if (OB_FAIL(memtable_mgr_->get_memtable_for_multi_source_data_unit(memtable, memtable::MultiSourceDataUnitType::TABLET_TX_DATA))) {
TRANS_LOG(WARN, "failed to get multi source data unit", K(ret), K(ls_id), K(tablet_id), K(memtable_scn));

4
src/storage/tablet/ob_tablet_create_delete_helper.cpp
View File

@ -660,10 +660,10 @@ int ObTabletCreateDeleteHelper::abort_create_tablets(
} else if (OB_UNLIKELY(arg.id_ != ls_id)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected arg", K(ret), K(PRINT_CREATE_ARG(arg)));
} else if (OB_FAIL(do_abort_create_tablets(arg, trans_flags))) {
LOG_WARN("failed to do abort create tablets", K(ret), K(PRINT_CREATE_ARG(arg)), K(trans_flags));
} else if (OB_FAIL(ObTabletBindingHelper::fix_binding_info_for_create_tablets(arg, ls_, trans_flags))) {
LOG_WARN("failed to fix_binding_info_for_create_tablets", K(ret), K(arg), K(trans_flags));
} else if (OB_FAIL(do_abort_create_tablets(arg, trans_flags))) {
LOG_WARN("failed to do abort create tablets", K(ret), K(PRINT_CREATE_ARG(arg)), K(trans_flags));
} else if (OB_FAIL(ObTabletBindingHelper::unlock_tablet_binding_for_create(arg, ls_, trans_flags))) {
LOG_WARN("failed to unlock tablet binding", K(ret), K(trans_flags));
} else {