提交 b9147642 编写于 作者: R renju96 提交者: ob-robot

fix the bug that IO_callback didnot pass tenant_id

上级 3c4b9d36
......@@ -756,21 +756,23 @@ int ObTenantIOManager::update_basic_io_config(const ObTenantIOConfig &io_config)
} else if (io_config == io_config_) {
// basic config not change, do nothing
} else {
if (OB_FAIL(io_allocator_.update_memory_limit(io_config.memory_limit_))) {
LOG_WARN("update memory limit failed", K(ret), K(io_config.memory_limit_));
} else if (OB_FAIL(callback_mgr_.update_thread_count(io_config.callback_thread_count_))) {
LOG_WARN("callback manager adjust thread failed", K(ret), K(io_config));
} else {
// just update basic config
DRWLock::WRLockGuard guard(io_config_lock_);
io_config_.memory_limit_ = io_config.memory_limit_;
io_config_.callback_thread_count_ = io_config.callback_thread_count_;
io_config_.unit_config_ = io_config.unit_config_;
ATOMIC_SET(&io_config_.enable_io_tracer_, io_config.enable_io_tracer_);
if (!io_config.enable_io_tracer_) {
io_tracer_.reuse();
MTL_SWITCH(tenant_id_) {
if (OB_FAIL(io_allocator_.update_memory_limit(io_config.memory_limit_))) {
LOG_WARN("update memory limit failed", K(ret), K(io_config.memory_limit_));
} else if (OB_FAIL(callback_mgr_.update_thread_count(io_config.callback_thread_count_))) {
LOG_WARN("callback manager adjust thread failed", K(ret), K(io_config));
} else {
// just update basic config
DRWLock::WRLockGuard guard(io_config_lock_);
io_config_.memory_limit_ = io_config.memory_limit_;
io_config_.callback_thread_count_ = io_config.callback_thread_count_;
io_config_.unit_config_ = io_config.unit_config_;
ATOMIC_SET(&io_config_.enable_io_tracer_, io_config.enable_io_tracer_);
if (!io_config.enable_io_tracer_) {
io_tracer_.reuse();
}
LOG_INFO("update basic io config success", K(tenant_id_), K(io_config_));
}
LOG_INFO("update basic io config success", K(tenant_id_), K(io_config_));
}
}
return ret;
......
......@@ -2504,7 +2504,7 @@ int ObIORunner::handle(ObIORequest *req)
ret = OB_ERR_UNEXPECTED;
LOG_WARN("io request can not do callback", K(ret), K(*req));
} else if (OB_FAIL(req->copied_callback_->process(OB_SUCCESS == req->ret_code_.io_ret_))) {
LOG_WARN("fail to callback", K(ret), K(*req));
LOG_WARN("fail to callback", K(ret), K(*req), K(MTL_ID()));
}
req->time_log_.callback_finish_ts_ = ObTimeUtility::fast_current_time();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册