diff --git a/src/sql/ob_sql_trans_control.cpp b/src/sql/ob_sql_trans_control.cpp index 5601370b8..418d65c34 100644 --- a/src/sql/ob_sql_trans_control.cpp +++ b/src/sql/ob_sql_trans_control.cpp @@ -1157,12 +1157,16 @@ int ObSqlTransControl::check_ls_readable(const uint64_t tenant_id, } else if (OB_ISNULL(ls = handle.get_ls())) { ret = OB_ERR_UNEXPECTED; LOG_WARN("id service log stream not exist"); + } else { + can_read = true; + } + /* } else if (ObTimeUtility::current_time() - max_stale_time_us < ls->get_ls_wrs_handler()->get_ls_weak_read_ts().convert_to_ts()) { can_read = true; } else if (REACH_TIME_INTERVAL(10 * 1000 * 1000)) { LOG_WARN("log stream unreadable", K(ls_id), K(addr), K(max_stale_time_us)); - } + }*/ } else { LOG_TRACE("log stream is not local", K(ls_id), K(addr)); } diff --git a/src/storage/tx/ob_tx_api.cpp b/src/storage/tx/ob_tx_api.cpp index 3d60b074b..d9ccf3ff0 100644 --- a/src/storage/tx/ob_tx_api.cpp +++ b/src/storage/tx/ob_tx_api.cpp @@ -715,6 +715,7 @@ ERRSIM_POINT_DEF(ERRSIM_WEAK_READ_SNAPSHOT_DELAY_US); int ObTransService::get_weak_read_snapshot_version(const int64_t max_read_stale_time, SCN &snapshot) { + UNUSED(max_read_stale_time); int ret = OB_SUCCESS; bool monotinic_read = true;; // server weak read version @@ -730,7 +731,8 @@ int ObTransService::get_weak_read_snapshot_version(const int64_t max_read_stale_ // do nothing } if (OB_SUCC(ret)) { - const int64_t snapshot_barrier = ObTimeUtility::current_time() - max_read_stale_time + int64_t max_stale_time = ObWeakReadUtil::max_stale_time_for_weak_consistency(tenant_id_, 0); + const int64_t snapshot_barrier = ObTimeUtility::current_time() - max_stale_time + abs(ERRSIM_WEAK_READ_SNAPSHOT_DELAY_US); if (snapshot.convert_to_ts() < snapshot_barrier) { TRANS_LOG(WARN, "weak read snapshot too stale", K(snapshot),