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

[FIX] mini merge of tx data may fail because of gts service error

Browse Source
This commit is contained in:
ZenoWang
2023-11-15 09:44:58 +00:00
committed by ob-robot
parent 819e223764
commit df9f15b360
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/tx_table/ob_tx_data_table.cpp
View File

@ -782,8 +782,11 @@ int ObTxDataTable::get_recycle_scn(SCN &recycle_scn)
//it may cause the standby tenant to commit and recycle when the primary is switched to standby. //it may cause the standby tenant to commit and recycle when the primary is switched to standby.
SCN snapshot_version; SCN snapshot_version;
MonotonicTs unused_ts(0); MonotonicTs unused_ts(0);
if (OB_FAIL(OB_TS_MGR.get_gts(MTL_ID(), MonotonicTs(1), NULL, snapshot_version, unused_ts))) { int tmp_ret = OB_SUCCESS;
LOG_WARN("failed to get snapshot version", K(ret), K(MTL_ID())); if (OB_TMP_FAIL(OB_TS_MGR.get_gts(MTL_ID(), MonotonicTs(1), NULL, snapshot_version, unused_ts))) {
LOG_WARN("failed to get snapshot version", K(tmp_ret), K(MTL_ID()));
// recycle nothing this time
recycle_scn.set_min();
} else { } else {
recycle_scn = std::min(recycle_scn, snapshot_version); recycle_scn = std::min(recycle_scn, snapshot_version);
} }

4
src/storage/tx_table/ob_tx_table.cpp
View File

@ -917,7 +917,9 @@ int ObTxTable::get_recycle_scn(SCN &real_recycle_scn)
SCN tablet_recycle_scn = SCN::min_scn(); SCN tablet_recycle_scn = SCN::min_scn();
const int64_t retain_tx_data_us = tx_result_retention * 1000L * 1000L; const int64_t retain_tx_data_us = tx_result_retention * 1000L * 1000L;
if (current_time_us - recycle_scn_cache_.update_ts_ < retain_tx_data_us && recycle_scn_cache_.val_.is_valid()) { if (current_time_us - recycle_scn_cache_.update_ts_ < retain_tx_data_us
&& recycle_scn_cache_.val_.is_valid()
&& (!recycle_scn_cache_.val_.is_min())) {
// cache is valid, get recycle scn from cache // cache is valid, get recycle scn from cache
real_recycle_scn = recycle_scn_cache_.val_; real_recycle_scn = recycle_scn_cache_.val_;
STORAGE_LOG(INFO, "use recycle scn cache", K(ls_id_), K(recycle_scn_cache_)); STORAGE_LOG(INFO, "use recycle scn cache", K(ls_id_), K(recycle_scn_cache_));