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

do not validate tx data in ObLS::replay_get_tablet

Browse Source
This commit is contained in:
hiddenbomb
2023-01-28 17:08:24 +08:00
committed by ob-robot
parent 3a88e28154
commit f7061b610e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ls/ob_ls.cpp
View File

@ -1206,7 +1206,7 @@ int ObLS::replay_get_tablet(const common::ObTabletID &tablet_id,
} }
} else { } else {
ObTabletTxMultiSourceDataUnit tx_data; ObTabletTxMultiSourceDataUnit tx_data;
if (OB_FAIL(tablet_handle.get_obj()->get_tx_data(tx_data))) { if (OB_FAIL(tablet_handle.get_obj()->get_tx_data(tx_data, false/*check_valid*/))) {
LOG_WARN("failed to get tablet tx data", KR(ret), K(tablet_handle)); LOG_WARN("failed to get tablet tx data", KR(ret), K(tablet_handle));
} else if (ObTabletStatus::CREATING == tx_data.tablet_status_) { } else if (ObTabletStatus::CREATING == tx_data.tablet_status_) {
ret = OB_EAGAIN; ret = OB_EAGAIN;

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

@ -3046,7 +3046,7 @@ int ObTablet::inner_get_tx_data(ObTabletTxMultiSourceDataUnit &tx_data, bool &ex
return ret; return ret;
} }
int ObTablet::get_tx_data(ObTabletTxMultiSourceDataUnit &tx_data) const int ObTablet::get_tx_data(ObTabletTxMultiSourceDataUnit &tx_data, const bool check_valid) const
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const uint64_t tenant_id = MTL_ID(); const uint64_t tenant_id = MTL_ID();
@ -3058,7 +3058,7 @@ int ObTablet::get_tx_data(ObTabletTxMultiSourceDataUnit &tx_data) const
LOG_WARN("not inited", K(ret), K_(is_inited), K(tenant_id), K(ls_id), K(tablet_id)); LOG_WARN("not inited", K(ret), K_(is_inited), K(tenant_id), K(ls_id), K(tablet_id));
} else if (OB_FAIL(inner_get_tx_data(tx_data, exist_on_memtable))) { } else if (OB_FAIL(inner_get_tx_data(tx_data, exist_on_memtable))) {
LOG_WARN("fail to inner get tx data", K(ret)); LOG_WARN("fail to inner get tx data", K(ret));
} else if (OB_UNLIKELY(!tx_data.is_valid())) { } else if (check_valid && OB_UNLIKELY(!tx_data.is_valid())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error, tx data is invalid", K(ret), K(tenant_id), K(ls_id), K(tablet_id), LOG_WARN("unexpected error, tx data is invalid", K(ret), K(tenant_id), K(ls_id), K(tablet_id),
K(exist_on_memtable), K(tx_data)); K(exist_on_memtable), K(tx_data));

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

@ -240,7 +240,7 @@ public:
// multi-source data operation // multi-source data operation
int check_tx_data(bool &is_valid) const; int check_tx_data(bool &is_valid) const;
int get_tx_data(ObTabletTxMultiSourceDataUnit &tx_data) const; int get_tx_data(ObTabletTxMultiSourceDataUnit &tx_data, const bool check_valid = true) const;
int get_ddl_data(ObTabletBindingInfo &ddl_data) const; int get_ddl_data(ObTabletBindingInfo &ddl_data) const;
int get_tablet_status(ObTabletStatus::Status &tablet_status); int get_tablet_status(ObTabletStatus::Status &tablet_status);