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

fix: check di session collect before unlock it.

Browse Source
This commit is contained in:
rolandqi 2023-09-21 02:14:07 +00:00 committed by ob-robot
parent 5e256552c2
commit 63af0e6566
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/observer/virtual_table/ob_all_virtual_session_wait_history.cpp
View File

@ -109,9 +109,11 @@ int ObAllVirtualSessionWaitHistory::inner_get_next_row(ObNewRow *&row)
} else {
session_iter_++;
collect_->lock_.unlock();
collect_ = nullptr;
}
} else {
session_iter_++;
collect_ = nullptr;
}
}
}
@ -120,7 +122,9 @@ int ObAllVirtualSessionWaitHistory::inner_get_next_row(ObNewRow *&row)
if (OB_ITER_END == (iter_ret = history_iter_.get_next(event_desc))) {
session_iter_++;
event_iter_ = 0;
collect_->lock_.unlock();
if (OB_NOT_NULL(collect_)) {
collect_->lock_.unlock();
}
while (OB_SUCCESS == ret && session_iter_ < session_status_.count()) {
collect_ = session_status_.at(session_iter_).second;
if (NULL != collect_ && OB_SUCCESS == collect_->lock_.try_rdlock()) {