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

[to #2024120400105981374]bugFix dbms_job deadlock

Browse Source
This commit is contained in:
seuwebber
2024-12-09 05:15:55 +00:00
committed by ob-robot
parent 9ea869ed68
commit e7957aaa7f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/objit/src/ob_llvm_di_helper.cpp
View File

@ -404,9 +404,9 @@ int ObLLVMDIHelper::create_subroutine_type(ObIArray<ObLLVMDIType> &member_types,
} }
} }
return ret; return ret;
} }
int ObLLVMDIHelper::get_current_scope(ObLLVMDIScope &scope) int ObLLVMDIHelper::get_current_scope(ObLLVMDIScope &scope)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_ISNULL(jc_) || (OB_ISNULL(jc_->file_) && OB_ISNULL(jc_->sp_))) { if (OB_ISNULL(jc_) || (OB_ISNULL(jc_->file_) && OB_ISNULL(jc_->sp_))) {

2
src/observer/dbms_job/ob_dbms_job_master.cpp
View File

@ -77,10 +77,10 @@ int ObDBMSJobTask::stop()
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("dbms job task not inited", K(ret), K(inited_)); LOG_WARN("dbms job task not inited", K(ret), K(inited_));
} else { } else {
ObSpinLockGuard guard(lock_);
timer_.cancel(*this); timer_.cancel(*this);
timer_.stop(); timer_.stop();
timer_.wait(); timer_.wait();
ObSpinLockGuard guard(lock_);
wait_vector_.clear(); wait_vector_.clear();
job_key_ = NULL; job_key_ = NULL;
ready_queue_ = NULL; ready_queue_ = NULL;