remove tenant io manager hash in io manager
This commit is contained in:
@ -165,10 +165,16 @@ public:
|
||||
blocksstable::TestDataFilePrepare::SetUp();
|
||||
ret = blocksstable::ObTmpFileManager::get_instance().init();
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
static ObTenantBase tenant_ctx(tenant_id_);
|
||||
ObTenantEnv::set_tenant(&tenant_ctx);
|
||||
ObTenantIOManager *io_service = nullptr;
|
||||
EXPECT_EQ(OB_SUCCESS, ObTenantIOManager::mtl_init(io_service));
|
||||
if (!is_server_tenant(tenant_id_)) {
|
||||
static ObTenantBase tenant_ctx(tenant_id_);
|
||||
ObTenantEnv::set_tenant(&tenant_ctx);
|
||||
ObTenantIOManager *io_service = nullptr;
|
||||
EXPECT_EQ(OB_SUCCESS, ObTenantIOManager::mtl_new(io_service));
|
||||
EXPECT_EQ(OB_SUCCESS, ObTenantIOManager::mtl_init(io_service));
|
||||
EXPECT_EQ(OB_SUCCESS, io_service->start());
|
||||
tenant_ctx.set(io_service);
|
||||
ObTenantEnv::set_tenant(&tenant_ctx);
|
||||
}
|
||||
|
||||
cell_cnt_ = COLS;
|
||||
init_exprs();
|
||||
|
@ -71,10 +71,16 @@ public:
|
||||
blocksstable::TestDataFilePrepare::SetUp();
|
||||
ret = blocksstable::ObTmpFileManager::get_instance().init();
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
static ObTenantBase tenant_ctx(tenant_id_);
|
||||
ObTenantEnv::set_tenant(&tenant_ctx);
|
||||
ObTenantIOManager *io_service = nullptr;
|
||||
EXPECT_EQ(OB_SUCCESS, ObTenantIOManager::mtl_init(io_service));
|
||||
if (!is_server_tenant(tenant_id_)) {
|
||||
static ObTenantBase tenant_ctx(tenant_id_);
|
||||
ObTenantEnv::set_tenant(&tenant_ctx);
|
||||
ObTenantIOManager *io_service = nullptr;
|
||||
EXPECT_EQ(OB_SUCCESS, ObTenantIOManager::mtl_new(io_service));
|
||||
EXPECT_EQ(OB_SUCCESS, ObTenantIOManager::mtl_init(io_service));
|
||||
EXPECT_EQ(OB_SUCCESS, io_service->start());
|
||||
tenant_ctx.set(io_service);
|
||||
ObTenantEnv::set_tenant(&tenant_ctx);
|
||||
}
|
||||
|
||||
row_.count_ = COLS;
|
||||
row_.cells_ = cells_;
|
||||
|
@ -167,8 +167,6 @@ int TestOpEngine::prepare_io(const string & test_data_name_suffix)
|
||||
LOG_WARN("add device channel failed", K(ret));
|
||||
} else if (OB_FAIL(ObIOManager::get_instance().start())) {
|
||||
LOG_WARN("fail to start io manager", K(ret));
|
||||
} else if (OB_FAIL(ObIOManager::get_instance().add_tenant_io_manager(OB_SYS_TENANT_ID, io_config))) {
|
||||
LOG_WARN("add tenant io config failed", K(ret));
|
||||
} else if (OB_FAIL(OB_SERVER_BLOCK_MGR.init(THE_IO_DEVICE, storage_env_.default_block_size_))) {
|
||||
STORAGE_LOG(WARN, "init block manager fail", K(ret));
|
||||
} else if (OB_FAIL(FileDirectoryUtils::create_full_path(file_dir))) {
|
||||
|
Reference in New Issue
Block a user