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

[FEAT MERGE] Merge syslog user experience improvement to master

Browse Source 
Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: chaser-ch <chaser.ch@antgroup.com>
This commit is contained in:
stdliu
2023-02-06 15:52:23 +08:00
committed by ob-robot
parent 1de9266dd0
commit f8c5c2647f
796 changed files with 4465 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/executor/ob_task_runner_notifier_service.cpp
View File

@ -39,10 +39,10 @@ void ObTaskRunnerNotifierService::ObKillTaskRunnerNotifier::operator()(
ret_ = OB_SUCCESS;
if (OB_ISNULL(entry.second)) {
ret_ = OB_ERR_UNEXPECTED;
LOG_ERROR("notifier is NULL", K(ret_), "key", entry.first);
LOG_ERROR_RET(ret_, "notifier is NULL", K(ret_), "key", entry.first);
} else {
if (OB_SUCCESS != (ret_ = entry.second->kill())) {
LOG_WARN("notify kill task failed", K(ret_));
LOG_WARN_RET(ret_, "notify kill task failed", K(ret_));
}
}
}
@ -103,7 +103,7 @@ ObTaskRunnerNotifierService *ObTaskRunnerNotifierService::get_instance()
{
ObTaskRunnerNotifierService *instance = NULL;
if (OB_ISNULL(instance_) || OB_UNLIKELY(!instance_->inited_)) {
LOG_ERROR("instance is NULL or not inited", K(instance_));
LOG_ERROR_RET(OB_ERR_UNEXPECTED, "instance is NULL or not inited", K(instance_));
} else {
instance = instance_;
}