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

fix max_stale_time_ns is us actually

Browse Source
This commit is contained in:
dimstars
2023-03-11 05:41:12 +00:00
committed by ob-robot
parent a6f4e3965c
commit 8842a2ff03
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/ob_sql_trans_control.cpp
View File

@ -1132,7 +1132,7 @@ void ObSqlTransControl::clear_xa_branch(const ObXATransID &xid, ObTxDesc *&tx_de
int ObSqlTransControl::check_ls_readable(const uint64_t tenant_id, int ObSqlTransControl::check_ls_readable(const uint64_t tenant_id,
const share::ObLSID &ls_id, const share::ObLSID &ls_id,
const common::ObAddr &addr, const common::ObAddr &addr,
const int64_t max_stale_time_ns, const int64_t max_stale_time_us,
bool &can_read) bool &can_read)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -1140,9 +1140,9 @@ int ObSqlTransControl::check_ls_readable(const uint64_t tenant_id,
if (!ls_id.is_valid() if (!ls_id.is_valid()
|| !addr.is_valid() || !addr.is_valid()
|| max_stale_time_ns <= 0) { || max_stale_time_us <= 0) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ls_id), K(addr), K(max_stale_time_ns)); LOG_WARN("invalid argument", K(ls_id), K(addr), K(max_stale_time_us));
} else if (observer::ObServer::get_instance().get_self() == addr) { } else if (observer::ObServer::get_instance().get_self() == addr) {
storage::ObLSService *ls_svr = MTL(storage::ObLSService *); storage::ObLSService *ls_svr = MTL(storage::ObLSService *);
storage::ObLSHandle handle; storage::ObLSHandle handle;
@ -1156,9 +1156,11 @@ int ObSqlTransControl::check_ls_readable(const uint64_t tenant_id,
} else if (OB_ISNULL(ls = handle.get_ls())) { } else if (OB_ISNULL(ls = handle.get_ls())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("id service log stream not exist"); LOG_WARN("id service log stream not exist");
} else if (ObTimeUtility::current_time() - max_stale_time_ns / 1000 } else if (ObTimeUtility::current_time() - max_stale_time_us
< ls->get_ls_wrs_handler()->get_ls_weak_read_ts().convert_to_ts()) { < ls->get_ls_wrs_handler()->get_ls_weak_read_ts().convert_to_ts()) {
can_read = true; 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 { } else {
LOG_TRACE("log stream is not local", K(ls_id), K(addr)); LOG_TRACE("log stream is not local", K(ls_id), K(addr));

2
src/sql/ob_sql_trans_control.h
View File

@ -238,7 +238,7 @@ public:
static int check_ls_readable(const uint64_t tenant_id, static int check_ls_readable(const uint64_t tenant_id,
const share::ObLSID &ls_id, const share::ObLSID &ls_id,
const common::ObAddr &addr, const common::ObAddr &addr,
const int64_t max_stale_time_ns, const int64_t max_stale_time_us,
bool &can_read); bool &can_read);
private: private:
DISALLOW_COPY_AND_ASSIGN(ObSqlTransControl); DISALLOW_COPY_AND_ASSIGN(ObSqlTransControl);