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

rewriet ret code when get max replayed scn failed

Browse Source
This commit is contained in:
Minionyh
2023-05-15 09:16:36 +00:00
committed by ob-robot
parent 9c2eb9db5b
commit 1f8fbdbbc7
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/tx/ob_dup_table_util.cpp
View File

@ -881,6 +881,8 @@ int ObDupTableLSHandler::check_dup_tablet_readable(const ObTabletID &tablet_id,
|| OB_FAIL(log_handler_->get_max_decided_scn(tmp_max_replayed_scn)))) { || OB_FAIL(log_handler_->get_max_decided_scn(tmp_max_replayed_scn)))) {
DUP_TABLE_LOG(WARN, "get max replayed scn for dup table read failed", K(ret), K(ls_id_), DUP_TABLE_LOG(WARN, "get max replayed scn for dup table read failed", K(ret), K(ls_id_),
K(tablet_id), K(read_snapshot), KP(log_handler_), K(tmp_max_replayed_scn)); K(tablet_id), K(read_snapshot), KP(log_handler_), K(tmp_max_replayed_scn));
// rewrite ret code when get max replayed scn failed to drive retry
ret = OB_NOT_MASTER;
} else if (OB_FAIL(check_and_update_max_replayed_scn(max_replayed_scn))) { } else if (OB_FAIL(check_and_update_max_replayed_scn(max_replayed_scn))) {
DUP_TABLE_LOG(WARN, "invalid max_replayed_scn", K(ret), K(tablet_id), K(read_snapshot), DUP_TABLE_LOG(WARN, "invalid max_replayed_scn", K(ret), K(tablet_id), K(read_snapshot),
K(read_from_leader)); K(read_from_leader));

2
src/storage/tx/ob_trans_service_v4.cpp
View File

@ -1375,6 +1375,8 @@ int ObTransService::check_replica_readable_(const SCN &snapshot,
ret = OB_REPLICA_NOT_READABLE; ret = OB_REPLICA_NOT_READABLE;
} else if (OB_FAIL(ls.get_max_decided_scn(max_replayed_scn))) { } else if (OB_FAIL(ls.get_max_decided_scn(max_replayed_scn))) {
TRANS_LOG(WARN, "get max decided scn failed", K(ret)); TRANS_LOG(WARN, "get max decided scn failed", K(ret));
// rewrite ret code when get max decided scn failed
ret = OB_NOT_MASTER;
} else if (OB_FAIL(ls.get_tx_svr()->get_tx_ls_log_adapter()->check_dup_tablet_readable( } else if (OB_FAIL(ls.get_tx_svr()->get_tx_ls_log_adapter()->check_dup_tablet_readable(
tablet_id, tablet_id,
snapshot, snapshot,