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

fix wrong set of IO_TUNING is_inited_

Browse Source
This commit is contained in:
zhjc1124
2024-08-14 07:25:47 +00:00
committed by ob-robot
parent df87f4f90a
commit 0881d89dd1
1 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/share/io/ob_io_struct.cpp
View File

@ -843,10 +843,6 @@ void ObIOTuner::destroy()
void ObIOTuner::run1() void ObIOTuner::run1()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_UNLIKELY(!is_inited_)) {
ret = OB_NOT_INIT;
LOG_WARN("not init", K(ret), K(is_inited_));
} else {
const int64_t thread_id = get_thread_idx(); const int64_t thread_id = get_thread_idx();
set_thread_name("IO_TUNING", thread_id); set_thread_name("IO_TUNING", thread_id);
LOG_INFO("io tuner thread started"); LOG_INFO("io tuner thread started");
@ -865,7 +861,6 @@ void ObIOTuner::run1()
} }
LOG_INFO("io tuner thread stopped"); LOG_INFO("io tuner thread stopped");
} }
}
int64_t ObIOTuner::to_string(char *buf, const int64_t len) const int64_t ObIOTuner::to_string(char *buf, const int64_t len) const
{ {
@ -2763,9 +2758,10 @@ int ObIORunner::init(const int64_t queue_capacity, ObIAllocator &allocator)
LOG_WARN("init queue failed", K(ret), K(queue_capacity), KP(buf)); LOG_WARN("init queue failed", K(ret), K(queue_capacity), KP(buf));
} else if (OB_FAIL(TG_CREATE_TENANT(lib::TGDefIDs::IO_CALLBACK, tg_id_))) { } else if (OB_FAIL(TG_CREATE_TENANT(lib::TGDefIDs::IO_CALLBACK, tg_id_))) {
LOG_WARN("create runner thread failed", K(ret)); LOG_WARN("create runner thread failed", K(ret));
} else if (FALSE_IT(is_inited_ = true)) {
} else if (OB_FAIL(TG_SET_RUNNABLE_AND_START(tg_id_, *this))) { } else if (OB_FAIL(TG_SET_RUNNABLE_AND_START(tg_id_, *this))) {
LOG_WARN("start runner thread failed", K(ret), K(tg_id_)); LOG_WARN("start runner thread failed", K(ret), K(tg_id_));
} else {
is_inited_ = true;
} }
if (OB_UNLIKELY(!is_inited_)) { if (OB_UNLIKELY(!is_inited_)) {
destroy(); destroy();
@ -2811,10 +2807,6 @@ void ObIORunner::destroy()
void ObIORunner::run1() void ObIORunner::run1()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_UNLIKELY(!is_inited_)) {
ret = OB_NOT_INIT;
LOG_WARN("not init", K(ret), K(is_inited_));
} else {
lib::set_thread_name("DiskCB"); lib::set_thread_name("DiskCB");
LOG_INFO("io callback thread started"); LOG_INFO("io callback thread started");
while (!has_set_stop()) { while (!has_set_stop()) {
@ -2834,7 +2826,6 @@ void ObIORunner::run1()
} }
LOG_INFO("io callback thread stopped"); LOG_INFO("io callback thread stopped");
} }
}
int ObIORunner::push(ObIORequest &req) int ObIORunner::push(ObIORequest &req)
{ {