[FEAT MERGE] Merge syslog user experience improvement to master

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

View File

@ -1147,7 +1147,7 @@ void ObTmpFileHandle::reset()
if (NULL != ptr_) {
int tmp_ret = OB_SUCCESS;
if (OB_SUCCESS != (tmp_ret = ObTmpFileManager::get_instance().dec_handle_ref(*this))) {
STORAGE_LOG(WARN, "fail to decrease handle reference count", K(tmp_ret));
STORAGE_LOG_RET(WARN, tmp_ret, "fail to decrease handle reference count", K(tmp_ret));
} else {
ptr_ = nullptr;
}
@ -1250,7 +1250,7 @@ int ObTmpFileManager::get_next_fd(int64_t &next_fd)
}
} else {
ret = OB_FILE_ALREADY_EXIST;
STORAGE_LOG(WARN, "too much file", K(ret));
STORAGE_LOG_RET(WARN, OB_ERR_TOO_MUCH_TIME, "too much file", K(ret));
}
return ret;
}