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

fix ObIOResult set group_id

Browse Source
This commit is contained in:
zhjc1124 2024-10-12 04:08:05 +00:00 committed by ob-robot
parent a5e33d700d
commit 9ba19c31ff
43 changed files with 12 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mittest/mtlenv/storage/test_shared_block_reader_writer.cpp
View File

@ -438,7 +438,6 @@ TEST_F(TestSharedBlockRWriter, test_parse_data_from_object)
read_info.size_ = io_buf_size;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_BLOCK_RW_IO);
read_info.macro_block_id_ = block_id;
read_info.buf_ = static_cast<char *>(allocator_.alloc(io_buf_size));

2
src/observer/ob_srv_deliver.cpp
View File

@ -262,7 +262,7 @@ int dispatch_req(const uint64_t tenant_id, ObRequest &req, QueueThread *global_m
} else if (is_sys_tenant(tenant_id) || is_user_tenant(tenant_id)) {
MTL_SWITCH(tenant_id) {
QueueThread *mysql_queue = MTL(QueueThread *);
ObTenant *tenant = (ObTenant *)MTL_CTX();
ObTenant *tenant = static_cast<ObTenant *>(MTL_CTX());
mysql_queue->queue_.inc_push_worker_count();
if (OB_ISNULL(tenant)) {
ret = OB_TENANT_NOT_IN_SERVER;

3
src/share/backup/ob_backup_io_adapter.cpp
View File

@ -1330,7 +1330,6 @@ int ObBackupIoAdapter::async_io_manager_read(
const int64_t real_timeout_ms = OB_IO_MANAGER.get_object_storage_io_timeout_ms(io_info.tenant_id_);
io_info.timeout_us_ = real_timeout_ms * 1000L;
io_info.flag_.set_sync();
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(sys_module_id);
io_info.flag_.set_wait_event(ObWaitEventIds::OBJECT_STORAGE_READ);
io_info.flag_.set_read();
@ -1357,7 +1356,6 @@ int ObBackupIoAdapter::io_manager_write(
const int64_t real_timeout_ms = OB_IO_MANAGER.get_object_storage_io_timeout_ms(io_info.tenant_id_);
io_info.timeout_us_ = real_timeout_ms * 1000L;
io_info.flag_.set_sync();
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
// io_info.flag_.set_sys_module_id(OB_INVALID_ID);
io_info.flag_.set_wait_event(ObWaitEventIds::OBJECT_STORAGE_WRITE);
io_info.flag_.set_write();
@ -1391,7 +1389,6 @@ int ObBackupIoAdapter::async_io_manager_upload(
const int64_t real_timeout_ms = OB_IO_MANAGER.get_object_storage_io_timeout_ms(io_info.tenant_id_);
io_info.timeout_us_ = real_timeout_ms * 1000L;
io_info.flag_.set_sync();
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(sys_module_id);
io_info.flag_.set_wait_event(ObWaitEventIds::OBJECT_STORAGE_WRITE);
io_info.flag_.set_write();

1
src/share/io/ob_io_calibration.cpp
View File

@ -421,7 +421,6 @@ void ObIOBenchRunner::run1()
io_info.buf_ = ObIOMode::READ == load_.mode_ ? nullptr : write_buf_;
io_info.user_data_buf_ = ObIOMode::READ == load_.mode_ ? read_buf_ : nullptr;
io_info.flag_.set_mode(load_.mode_);
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(ObIOModule::CALIBRATION_IO);
io_info.flag_.set_wait_event(ObIOMode::READ == load_.mode_ ?
ObWaitEventIds::DB_FILE_DATA_READ : ObWaitEventIds::DB_FILE_COMPACT_WRITE);

1
src/share/io/ob_io_define.cpp
View File

@ -681,6 +681,7 @@ int ObIOResult::init(const ObIOInfo &info)
size_ = info.size_;
flag_ = info.flag_;
flag_.set_func_type(GET_FUNC_TYPE());
flag_.set_resource_group_id(GET_GROUP_ID());
timeout_us_ = info.timeout_us_;
buf_ = info.buf_;
user_data_buf_ = info.user_data_buf_;

2
src/share/io/ob_io_define.h
View File

@ -134,7 +134,6 @@ public:
bool is_valid() const;
void set_mode(ObIOMode mode);
ObIOMode get_mode() const;
void set_resource_group_id(const uint64_t group_id);
void set_wait_event(int64_t wait_event_id);
uint64_t get_resource_group_id() const;
void set_sys_module_id(const uint64_t sys_module_id);
@ -178,6 +177,7 @@ public:
private:
friend struct ObIOResult;
void set_func_type(const uint8_t func_type);
void set_resource_group_id(const uint64_t group_id);
static constexpr int64_t IO_MODE_BIT = 4; // read, write, append
static constexpr int64_t IO_FUNC_TYPE_BIT = 8;
static constexpr int64_t IO_WAIT_EVENT_BIT = 32; // for performance monitor

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

@ -3461,7 +3461,6 @@ int ObIOFaultDetector::record_timing_task(const int64_t first_id, const int64_t
retry_task->io_info_.user_data_buf_ = nullptr;
retry_task->io_info_.buf_ = nullptr;
retry_task->io_info_.flag_.set_mode(ObIOMode::READ);
retry_task->io_info_.flag_.set_resource_group_id(USER_RESOURCE_OTHER_GROUP_ID);
retry_task->io_info_.flag_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
retry_task->io_info_.flag_.set_time_detect();
retry_task->io_info_.fd_.first_id_ = first_id;
@ -3493,7 +3492,6 @@ int ObIOFaultDetector::set_detect_task_io_info_(
io_info.flag_ = result.flag_;
io_info.size_ = result.size_;
io_info.offset_ = result.offset_;
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(ObIOModule::DETECT_IO);
io_info.fd_ = req.fd_;
return ret;

1
src/share/ob_ddl_common.cpp
View File

@ -3192,7 +3192,6 @@ int ObDDLUtil::upload_block_for_ss(const char *buf, const int64_t len, const blo
object_info.mtl_tenant_id_ = MTL_ID();
object_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
object_info.io_desc_.set_unsealed();
object_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
object_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_BLOCK_RW_IO);
object_info.ls_epoch_id_ = 0;

2
src/share/redolog/ob_log_file_handler.cpp
View File

@ -254,7 +254,6 @@ int ObLogFileHandler::inner_read(const ObIOFd &io_fd, void *buf, const int64_t s
io_info.offset_ = offset + read_sz;
io_info.size_ = size - read_sz;
io_info.flag_.set_mode(ObIOMode::READ);
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(ObIOModule::SLOG_IO);
io_info.flag_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
io_info.buf_ = nullptr;
@ -342,7 +341,6 @@ int ObLogFileHandler::normal_retry_write(void *buf, int64_t size, int64_t offset
io_info.fd_.device_handle_ = &LOCAL_DEVICE_INSTANCE;
io_info.offset_ = offset;
io_info.size_ = size;
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(ObIOModule::SLOG_IO);
io_info.flag_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
io_info.buf_ = reinterpret_cast<const char *>(buf);

1
src/share/stat/ob_opt_system_stat.cpp
View File

@ -90,7 +90,6 @@ int OptSystemIoBenchmark::run_benchmark(ObIAllocator &allocator, const uint64_t
io_info.size_ = load_size;
io_info.buf_ = nullptr;
io_info.flag_.set_mode(ObIOMode::READ);
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(ObIOModule::CALIBRATION_IO);
io_info.flag_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
io_info.flag_.set_unlimited(true);

2
src/storage/access/ob_sstable_row_whole_scanner.cpp
View File

@ -294,7 +294,6 @@ int ObSSTableRowWholeScanner::open(
read_info.size_ = sstable_->get_macro_read_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_WHOLE_SCANNER_IO);
read_info.buf_ = io_buf_[0].data();
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
@ -447,7 +446,6 @@ int ObSSTableRowWholeScanner::prefetch()
read_info.size_ = sstable_->get_macro_read_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(common::ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_WHOLE_SCANNER_IO);
read_info.buf_ = io_buf_[io_index].data();
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);

1
src/storage/backup/ob_backup_reader.cpp
View File

@ -313,7 +313,6 @@ int ObMacroBlockBackupReader::get_macro_read_info_(
read_info.offset_ = block_info_.nested_offset_;
read_info.size_ = block_info_.nested_size_;
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_MIGRATE_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::BACKUP_READER_IO);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.mtl_tenant_id_ = MTL_ID();

1
src/storage/blocksstable/index_block/ob_clustered_index_block_writer.cpp
View File

@ -293,7 +293,6 @@ int ObClusteredIndexBlockWriter::rewrite_and_append_clustered_index_micro_block(
read_info.size_ = micro_size;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_INDEX_BUILDER_IO);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.mtl_tenant_id_ = MTL_ID();

2
src/storage/blocksstable/index_block/ob_index_block_builder.cpp
View File

@ -1744,7 +1744,6 @@ int ObSSTableIndexBuilder::rewrite_small_sstable(ObSSTableMergeRes &res)
read_info.mtl_tenant_id_ = MTL_ID();
read_info.io_timeout_ms_ =
std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_INDEX_BUILDER_IO);
if (OB_ISNULL(read_info.buf_ = reinterpret_cast<char *>(
@ -1862,7 +1861,6 @@ int ObSSTableIndexBuilder::load_single_macro_block(
read_info.io_timeout_ms_ =
std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.mtl_tenant_id_ = MTL_ID();
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_INDEX_BUILDER_IO);
if (OB_ISNULL(read_info.buf_ = reinterpret_cast<char *>(

1
src/storage/blocksstable/index_block/ob_index_block_macro_iterator.cpp
View File

@ -743,7 +743,6 @@ int ObIndexBlockMacroIterator::get_cs_range(
read_info.size_ = sstable_->get_macro_read_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::INDEX_BLOCK_MICRO_ITER_IO);
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.macro_block_id_ = block_id;

1
src/storage/blocksstable/index_block/ob_index_block_tree_cursor.cpp
View File

@ -1136,7 +1136,6 @@ int ObIndexBlockTreeCursor::load_micro_block_data(const MacroBlockId &macro_bloc
read_info.size_ = idx_row_header.get_block_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::INDEX_BLOCK_TREE_CURSOR_IO);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.mtl_tenant_id_ = MTL_ID();

1
src/storage/blocksstable/index_block/ob_sstable_meta_info.cpp
View File

@ -291,7 +291,6 @@ int ObRootBlockInfo::read_block_data(
read_info.buf_ = buf;
read_info.mtl_tenant_id_ = MTL_ID();
read_info.bypass_micro_cache_ = true;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::ROOT_BLOCK_IO);
if (OB_FAIL(addr.get_block_addr(read_info.macro_block_id_, read_info.offset_, read_info.size_))) {
LOG_WARN("fail to get block address", K(ret), K(addr));

1
src/storage/blocksstable/ob_block_manager.cpp
View File

@ -1649,7 +1649,6 @@ int ObBlockManager::InspectBadBlockTask::check_block(
read_info.offset_ = 0;
read_info.size_ = OB_STORAGE_OBJECT_MGR.get_macro_block_size();
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::INSPECT_BAD_BLOCK_IO);
if (OB_ISNULL(read_info.buf_ = reinterpret_cast<char *>(

1
src/storage/blocksstable/ob_bloom_filter_data_reader.cpp
View File

@ -82,7 +82,6 @@ int ObBloomFilterMacroBlockReader::read_macro_block(const MacroBlockId &macro_id
macro_read_info.macro_block_id_ = macro_id;
macro_read_info.io_desc_.set_mode(ObIOMode::READ);
macro_read_info.io_desc_.set_wait_event(is_sys_read_ ? ObWaitEventIds::DB_FILE_COMPACT_READ : ObWaitEventIds::DB_FILE_DATA_READ);
macro_read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
macro_read_info.io_desc_.set_sys_module_id(ObIOModule::BLOOM_FILTER_IO);
macro_read_info.offset_ = 0;
macro_read_info.size_ = OB_STORAGE_OBJECT_MGR.get_macro_block_size();

13
src/storage/blocksstable/ob_bloom_filter_data_writer.cpp
View File

@ -1,13 +1,13 @@
/**
* Copyright (c) 2021 OceanBase
* OceanBase CE is licensed under Mulan PubL v2.
* You can use this software according to the terms and conditions of the Mulan
* PubL v2. You may obtain a copy of Mulan PubL v2 at:
* You can use this software according to the terms and conditions of the Mulan PubL v2.
* You may obtain a copy of Mulan PubL v2 at:
* http://license.coscl.org.cn/MulanPubL-2.0
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
* KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
* NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the
* Mulan PubL v2 for more details.
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PubL v2 for more details.
*/
#define USING_LOG_PREFIX STORAGE
@ -363,7 +363,6 @@ int ObBloomFilterMacroBlockWriter::flush_macro_block() {
macro_write_info.offset_ = 0;
macro_write_info.io_desc_.set_wait_event(
ObWaitEventIds::DB_FILE_COMPACT_WRITE);
macro_write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
macro_write_info.io_desc_.set_sys_module_id(ObIOModule::BLOOM_FILTER_IO);
macro_write_info.io_desc_.set_sealed();
macro_write_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;

1
src/storage/blocksstable/ob_macro_block.cpp
View File

@ -377,7 +377,6 @@ int ObMacroBlock::flush(ObStorageObjectHandle &macro_handle,
object_info.mtl_tenant_id_ = MTL_ID();
object_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
object_info.io_desc_.set_sealed();
object_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
object_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_MACRO_BLOCK_WRITE_IO);
object_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
object_info.device_handle_ = device_handle;

2
src/storage/blocksstable/ob_macro_block_handle.cpp
View File

@ -148,7 +148,6 @@ int ObMacroBlockHandle::async_read(const ObMacroBlockReadInfo &read_info)
io_info.user_data_buf_ = read_info.buf_;
io_info.buf_ = read_info.buf_; // for sync io
// resource manager level is higher than default
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(read_info.io_desc_.get_sys_module_id());
io_info.flag_.set_read();
@ -207,7 +206,6 @@ int ObMacroBlockHandle::async_write(const ObMacroBlockWriteInfo &write_info)
}
const int64_t real_timeout_ms = min(write_info.io_timeout_ms_, GCONF._data_storage_io_timeout / 1000L);
io_info.timeout_us_ = real_timeout_ms * 1000L;
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(write_info.io_desc_.get_sys_module_id());
io_info.flag_.set_write();

1
src/storage/blocksstable/ob_macro_block_writer.cpp
View File

@ -1563,7 +1563,6 @@ int ObMacroBlockWriter::check_write_complete(const MacroBlockId &macro_block_id)
read_info.size_ = OB_STORAGE_OBJECT_MGR.get_macro_block_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SSTABLE_MACRO_BLOCK_WRITE_IO);
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.macro_block_id_ = macro_block_id;

4
src/storage/blocksstable/ob_micro_block_cache.cpp
View File

@ -974,7 +974,6 @@ int ObIMicroBlockCache::prefetch(
read_info.macro_block_id_ = macro_id;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::MICRO_BLOCK_CACHE_IO);
read_info.io_callback_ = &callback;
read_info.offset_ = idx_row.get_block_offset();
@ -1023,7 +1022,6 @@ int ObIMicroBlockCache::prefetch(
read_info.macro_block_id_ = macro_id;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::MICRO_BLOCK_CACHE_IO);
read_info.io_callback_ = &callback;
read_info.offset_ = offset;
@ -1260,7 +1258,6 @@ int ObDataMicroBlockCache::load_block(
macro_read_info.macro_block_id_ = micro_block_id.macro_id_;
macro_read_info.io_desc_.set_mode(ObIOMode::READ);
macro_read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
macro_read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
macro_read_info.io_desc_.set_sys_module_id(ObIOModule::MICRO_BLOCK_CACHE_IO);
macro_read_info.io_callback_ = callback;
macro_read_info.offset_ = micro_block_id.offset_;
@ -1563,7 +1560,6 @@ int ObIndexMicroBlockCache::load_block(
macro_read_info.macro_block_id_ = micro_block_id.macro_id_;
macro_read_info.io_desc_.set_mode(ObIOMode::READ);
macro_read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
macro_read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
macro_read_info.io_desc_.set_sys_module_id(ObIOModule::MICRO_BLOCK_CACHE_IO);
macro_read_info.io_callback_ = callback;
macro_read_info.offset_ = micro_block_id.offset_;

2
src/storage/blocksstable/ob_object_manager.cpp
View File

@ -791,7 +791,6 @@ int ObObjectManager::ss_read_super_block_(
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.buf_ = super_block_buf_holder_.get_buffer(),
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SLOG_IO);
read_info.offset_ = 0;
read_info.size_ = super_block_buf_holder_.get_len();
@ -828,7 +827,6 @@ int ObObjectManager::ss_write_super_block_(const ObServerSuperBlock &super_block
write_info.buffer_ = super_block_buf_holder_.get_buffer();
write_info.size_ = super_block_buf_holder_.get_len();
write_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::SLOG_IO);
write_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
write_info.mtl_tenant_id_ = OB_SERVER_TENANT_ID;

2
src/storage/blocksstable/ob_shared_macro_block_manager.cpp
View File

@ -286,7 +286,6 @@ int ObSharedMacroBlockMgr::write_block(
read_info.offset_ = offset;
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_MACRO_BLOCK_MGR_IO);
ObMacroBlockHandle read_handle;
ObSSTableMacroBlockChecker macro_block_checker;
@ -909,7 +908,6 @@ int ObSharedMacroBlockMgr::read_sstable_block(
read_info.size_ = upper_align(sstable.get_macro_read_size(), DIO_READ_ALIGN_SIZE);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_MACRO_BLOCK_MGR_IO);
if (OB_ISNULL(read_info.buf_ = reinterpret_cast<char*>(allocator.alloc(read_info.size_)))) {

3
src/storage/blocksstable/ob_storage_object_handle.cpp
View File

@ -229,14 +229,12 @@ int ObStorageObjectHandle::sn_async_read(const ObStorageObjectReadInfo &read_inf
io_info.fd_.second_id_ = read_info.macro_block_id_.second_id();
io_info.fd_.third_id_ = read_info.macro_block_id_.third_id();
io_info.fd_.device_handle_ = &LOCAL_DEVICE_INSTANCE;
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(read_info.io_desc_.get_sys_module_id());
const int64_t real_timeout_ms = min(read_info.io_timeout_ms_, GCONF._data_storage_io_timeout / 1000L);
io_info.timeout_us_ = real_timeout_ms * 1000L;
io_info.user_data_buf_ = read_info.buf_;
io_info.buf_ = read_info.buf_; // for sync io
// resource manager level is higher than default
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(read_info.io_desc_.get_sys_module_id());
io_info.flag_.set_read();
@ -294,7 +292,6 @@ int ObStorageObjectHandle::sn_async_write(const ObStorageObjectWriteInfo &write_
if (OB_FAIL(write_info.fill_io_info_for_backup(macro_id_, io_info))) {
LOG_WARN("failed to fill io info for backup", K(ret), K_(macro_id));
}
io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info.flag_.set_sys_module_id(write_info.io_desc_.get_sys_module_id());
const int64_t real_timeout_ms = min(write_info.io_timeout_ms_, GCONF._data_storage_io_timeout / 1000L);
io_info.timeout_us_ = real_timeout_ms * 1000L;

2
src/storage/blocksstable/ob_tmp_file_cache.cpp
View File

@ -482,7 +482,6 @@ int ObTmpPageCache::read_io(const ObTmpBlockIOInfo &io_info, ObITmpPageIOCallbac
read_info.io_callback_ = callback;
read_info.offset_ = io_info.offset_;
read_info.size_ = io_info.size_;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::TMP_PAGE_CACHE_IO);
if (OB_FAIL(object_handle.async_read(read_info))) {
STORAGE_LOG(WARN, "fail to async read block", K(ret), K(read_info));
@ -1493,7 +1492,6 @@ int ObTmpTenantMemBlockManager::write_io(
write_info.offset_ = ObTmpMacroBlock::get_header_padding();
write_info.size_ = io_info.size_;
write_info.io_timeout_ms_ = io_info.io_timeout_ms_;
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::TMP_TENANT_MEM_BLOCK_IO);
if (OB_FAIL(ObBlockManager::async_write_block(write_info, handle))) {
STORAGE_LOG(WARN, "Fail to async write block", K(ret), K(write_info), K(handle));

2
src/storage/blockstore/ob_shared_object_reader_writer.cpp
View File

@ -1047,7 +1047,6 @@ int ObSharedObjectReaderWriter::inner_write_block(
object_info.mtl_tenant_id_ = MTL_ID();
object_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
object_info.io_desc_.set_unsealed();
object_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
object_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_BLOCK_RW_IO);
object_info.ls_epoch_id_ = write_info.ls_epoch_;
@ -1177,7 +1176,6 @@ int ObSharedObjectReaderWriter::async_read(
#ifdef OB_BUILD_SHARED_STORAGE
object_read_info.ls_epoch_id_ = read_info.ls_epoch_;
#endif
object_read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
object_read_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_BLOCK_RW_IO);
object_read_info.io_callback_ = read_info.io_callback_;
object_read_info.mtl_tenant_id_ = MTL_ID();

1
src/storage/compaction/ob_index_block_micro_iterator.cpp
View File

@ -182,7 +182,6 @@ int ObIndexBlockMicroIterator::init(
read_info.size_ = sstable->get_macro_read_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::INDEX_BLOCK_MICRO_ITER_IO);
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.macro_block_id_ = macro_desc.macro_block_id_;

1
src/storage/compaction/ob_sstable_builder.cpp
View File

@ -42,7 +42,6 @@ int ObSSTableRebuildMicroBlockIter::prefetch()
read_info.size_ = common::OB_DEFAULT_MACRO_BLOCK_SIZE;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::INDEX_BLOCK_MICRO_ITER_IO);
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.macro_block_id_ = macro_id_array_.at(prefetch_idx_);

1
src/storage/direct_load/ob_direct_load_tmp_file.cpp
View File

@ -209,7 +209,6 @@ int ObDirectLoadTmpFileIOHandle::open(const ObDirectLoadTmpFileHandle &file_hand
tmp_file_ = tmp_file;
io_info_.dir_id_ = tmp_file_->get_file_id().dir_id_;
io_info_.fd_ = tmp_file_->get_file_id().fd_;
io_info_.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
io_info_.io_desc_.set_sys_module_id(ObIOModule::DIRECT_LOAD_IO);
io_info_.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
}

2
src/storage/high_availability/ob_storage_ha_macro_block_writer.cpp
View File

@ -325,7 +325,6 @@ int ObStorageHALocalMacroBlockWriter::set_macro_write_info_(
STORAGE_LOG(WARN, "failed to get tablet_transfer_seq", K(ret));
} else {
write_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_MIGRATE_WRITE);
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::HA_MACRO_BLOCK_WRITER_IO);
write_info.io_desc_.set_sealed();
write_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
@ -381,7 +380,6 @@ int ObStorageHASharedMacroBlockWriter::set_macro_write_info_(
LOG_WARN("macro tablet id in shared storage is not match", K(ret), K(macro_block_id), K(tablet_id), K(tablet_id_));
} else {
write_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_MIGRATE_WRITE);
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_BLOCK_RW_IO);
write_info.io_desc_.set_unsealed();
write_info.mtl_tenant_id_ = MTL_ID();

2
src/storage/high_availability/ob_storage_ha_reader.cpp
View File

@ -1274,7 +1274,6 @@ int ObCopyMacroBlockObProducer::prefetch_()
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.buf_ = io_buf_[handle_idx_];
read_info.mtl_tenant_id_ = MTL_ID();
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::HA_COPY_MACRO_BLOCK_IO);
if (OB_FAIL(ObObjectManager::async_read_object(read_info, copy_macro_block_handle_[handle_idx_].read_handle_))) {
STORAGE_LOG(WARN, "Fail to async read block, ", K(ret), K(read_info));
@ -4315,7 +4314,6 @@ int ObCopyRemoteSSTableMacroBlockRestoreReader::read_local_macro_block_data_(
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_MIGRATE_READ);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.buf_ = local_macro_data_buffer_;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::HA_COPY_MACRO_BLOCK_IO);
read_info.mtl_tenant_id_ = MTL_ID();
if (OB_FAIL(ObObjectManager::async_read_object(read_info, read_handle))) {

2
src/storage/meta_store/ob_storage_meta_io_util.h
View File

@ -55,7 +55,6 @@ public:
write_info.buffer_ = buf;
write_info.size_ = buf_len;
write_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::SLOG_IO);
write_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
write_info.ls_epoch_id_ = ls_epoch;
@ -98,7 +97,6 @@ public:
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.buf_ = buf;
read_info.macro_block_id_ = object_id;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SLOG_IO);
read_info.offset_ = 0;
read_info.size_ = object_size;

1
src/storage/ob_bloom_filter_task.cpp
View File

@ -157,7 +157,6 @@ int ObBloomFilterBuildTask::build_bloom_filter()
read_info.size_ = OB_DEFAULT_MACRO_BLOCK_SIZE;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::BLOOM_FILTER_IO);
read_info.io_timeout_ms_ = std::max(GCONF._data_storage_io_timeout / 1000, DEFAULT_IO_WAIT_TIME_MS);
read_info.mtl_tenant_id_ = MTL_ID();

4
src/storage/slog_ckpt/ob_linked_macro_block_reader.cpp
View File

@ -72,7 +72,6 @@ int ObLinkedMacroBlockReader::get_meta_blocks(const MacroBlockId &entry_block)
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::LINKED_MACRO_BLOCK_IO);
read_info.mtl_tenant_id_ = MTL_ID();
@ -131,7 +130,6 @@ int ObLinkedMacroBlockReader::prefetch_block()
read_info.size_ = OB_STORAGE_OBJECT_MGR.get_macro_block_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::LINKED_MACRO_BLOCK_IO);
read_info.macro_block_id_ = macros_handle_.at(prefetch_macro_block_idx_);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
@ -180,7 +178,6 @@ int ObLinkedMacroBlockReader::pread_block(const ObMetaDiskAddr &addr, ObStorageO
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;
read_info.buf_ = item_buf;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::LINKED_MACRO_BLOCK_IO);
read_info.mtl_tenant_id_ = MTL_ID();
if (OB_FAIL(addr.get_block_addr(read_info.macro_block_id_, read_info.offset_, read_info.size_))) {
@ -203,7 +200,6 @@ int ObLinkedMacroBlockReader::read_block_by_id(
read_info.size_ = OB_STORAGE_OBJECT_MGR.get_macro_block_size();
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::LINKED_MACRO_BLOCK_IO);
read_info.macro_block_id_ = block_id;
read_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;

1
src/storage/slog_ckpt/ob_linked_macro_block_writer.cpp
View File

@ -98,7 +98,6 @@ int ObLinkedMacroBlockWriter::write_block(
write_info.size_ = buf_len;
write_info.buffer_ = buf;
write_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_WRITE);
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::LINKED_MACRO_BLOCK_IO);
write_info.io_desc_.set_sealed();
write_info.io_timeout_ms_ = GCONF._data_storage_io_timeout / 1000L;

1
src/storage/slog_ckpt/ob_tablet_replay_create_handler.cpp
View File

@ -440,7 +440,6 @@ int ObTabletReplayCreateHandler::replay_aggregate_tablets(const ObIArray<ObTable
read_info.io_timeout_ms_ = 20000; // 20s
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_COMPACT_READ);
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::SHARED_BLOCK_RW_IO);
read_info.macro_block_id_ = total_tablet_item_arr_[range_arr.at(i).first].addr_.block_id();
read_info.mtl_tenant_id_ = MTL_ID();

1
src/storage/tmp_file/ob_tmp_file_cache.cpp
View File

@ -563,7 +563,6 @@ int ObTmpPageCache::async_read_(const blocksstable::MacroBlockId macro_block_id,
read_info.io_desc_ = io_desc;
read_info.io_timeout_ms_ = io_timeout_ms;
read_info.io_callback_ = callback;
read_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
read_info.io_desc_.set_sys_module_id(ObIOModule::TMP_TENANT_MEM_BLOCK_IO);
if (OB_FAIL(handle.async_read(read_info))) {

3
src/storage/tmp_file/ob_tmp_file_flush_ctx.cpp
View File

@ -406,8 +406,7 @@ int ObTmpFileFlushTask::write_one_block()
if (OB_SUCC(ret)) {
blocksstable::ObMacroBlockWriteInfo write_info;
write_info.io_desc_.set_wait_event(2); // TODO: 检查是否需要用临时文件自己的event
write_info.io_desc_.set_resource_group_id(THIS_WORKER.get_group_id());
write_info.io_desc_.set_sys_module_id(ObIOModule::TMP_TENANT_MEM_BLOCK_IO);
write_info.io_desc_.set_sys_module_id(ObIOModule::TMP_TENANT_MEM_BLOCK_IO);
write_info.buffer_ = get_data_buf();
write_info.size_ = upper_align(get_data_length(), ObTmpFileGlobal::PAGE_SIZE);
write_info.offset_ = 0;

4
unittest/storage/backup/test_backup_sync_io_mock_async_io.cpp
View File

@ -178,7 +178,7 @@ int prepare_macro_block_read_info(
read_info.size_ = size;
read_info.io_desc_.set_mode(ObIOMode::READ);
read_info.io_desc_.set_wait_event(ObWaitEventIds::DB_FILE_DATA_READ);
// read_info.io_desc_.set_resource_group_id(ObIOModule::ROOT_BLOCK_IO);
read_info.io_desc_.set_sys_module_id(ObIOModule::ROOT_BLOCK_IO);
return ret;
}
@ -240,7 +240,6 @@ int prepare_write_io_info(const ObBackupDeviceMacroBlockId &macro_id,
write_io_info.fd_.fd_id_ = static_cast<ObBackupWrapperIODevice *>(device_handle)->simulated_fd_id();
write_io_info.fd_.slot_version_ = static_cast<ObBackupWrapperIODevice *>(device_handle)->simulated_slot_version();
}
write_io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
write_io_info.flag_.set_write();
return ret;
}
@ -268,7 +267,6 @@ int prepare_read_io_info(const ObBackupDeviceMacroBlockId &macro_id,
read_io_info.buf_ = buf;
}
}
read_io_info.flag_.set_resource_group_id(THIS_WORKER.get_group_id());
read_io_info.flag_.set_read();
return ret;
}

7
unittest/storage/test_io_manager.cpp
View File

@ -113,7 +113,6 @@ static void get_random_io_info(ObIOInfo &io_info)
io_info.fd_.second_id_ = ObRandom::rand(0, 10000);
io_info.fd_.device_handle_ = &LOCAL_DEVICE_INSTANCE;
io_info.flag_.set_mode(static_cast<ObIOMode>(ObRandom::rand(0, (int)ObIOMode::MAX_MODE - 1)));
io_info.flag_.set_resource_group_id(USER_RESOURCE_OTHER_GROUP_ID); // 0 means default
io_info.flag_.set_wait_event(ObRandom::rand(1, 9999));
io_info.timeout_us_ = DEFAULT_IO_WAIT_TIME_US;
io_info.offset_ = ObRandom::rand(1, 1000L * 1000L * 1000L);
@ -171,7 +170,6 @@ TEST_F(TestIOStruct, IOFlag)
// normal usage
flag.set_mode(ObIOMode::READ);
flag.set_resource_group_id(USER_RESOURCE_OTHER_GROUP_ID);
flag.set_wait_event(99);
ASSERT_TRUE(flag.is_valid());
@ -212,7 +210,6 @@ TEST_F(TestIOStruct, IOInfo)
info.tenant_id_ = OB_SERVER_TENANT_ID;
info.fd_ = fd;
info.flag_.set_mode(ObIOMode::READ);
info.flag_.set_resource_group_id(USER_RESOURCE_OTHER_GROUP_ID);
info.flag_.set_wait_event(1);
info.timeout_us_ = DEFAULT_IO_WAIT_TIME_US;
info.offset_ = 80;
@ -327,7 +324,6 @@ TEST_F(TestIOStruct, IORequest)
read_info.tenant_id_ = OB_SERVER_TENANT_ID;
read_info.fd_ = fd;
read_info.flag_.set_mode(ObIOMode::READ);
read_info.flag_.set_resource_group_id(USER_RESOURCE_OTHER_GROUP_ID);
read_info.flag_.set_wait_event(1);
read_info.timeout_us_ = DEFAULT_IO_WAIT_TIME_US;
read_info.offset_ = 89;
@ -720,7 +716,7 @@ TEST_F(TestIOStruct, IOResult)
read_info.tenant_id_ = OB_SERVER_TENANT_ID;
read_info.fd_ = fd;
read_info.flag_.set_mode(ObIOMode::READ);
read_info.flag_.set_resource_group_id(10005);
SET_GROUP_ID(10005);
read_info.flag_.set_wait_event(1);
read_info.timeout_us_ = DEFAULT_IO_WAIT_TIME_US;
read_info.offset_ = 89;
@ -962,7 +958,6 @@ TEST_F(TestIOManager, simple)
io_info.fd_ = fd;
io_info.fd_.device_handle_ = &LOCAL_DEVICE_INSTANCE;
io_info.flag_.set_write();
io_info.flag_.set_resource_group_id(USER_RESOURCE_OTHER_GROUP_ID);
io_info.flag_.set_wait_event(100);
io_info.offset_ = 0;
io_info.size_ = write_io_size;