This commit is contained in:
hnwyllmm
2022-11-30 10:05:50 +00:00
committed by ob-robot
parent 47b0a3a4de
commit 59e975f9d7
14 changed files with 33 additions and 33 deletions

View File

@ -40,7 +40,7 @@ TEST(test_cluster_id_hash_conflict, test_cluster_id_hash)
common::ObAddr addr;
addr.parse_from_cstring("127.0.0.1:8080");
int64_t tenant_id = 500;
int64_t tenant_id = OB_SERVER_TENANT_ID;
// The binary of 112 and 120 are only one bit different
int64_t cluster_id_11 = 112;

View File

@ -119,7 +119,7 @@ TEST(TestDtlRpcChannel, Basic)
// // Create a DtlChannelInfo object, ci1 and ci2 are the channel information at both ends of the same channel.
// ObDtlChannelInfo ci1, ci2;
// const uint64_t tenant_id = 500;
// const uint64_t tenant_id = OB_SERVER_TENANT_ID;
// int ret = ObDtlChannelGroup::make_channel(tenant_id, self_addr, self_addr, ci1, ci2);
// ASSERT_EQ(OB_SUCCESS, ret);

View File

@ -683,7 +683,7 @@ public:
ASSERT_SUCC(OB_IO_MANAGER.add_device_channel(THE_IO_DEVICE, 16, 2, 1024));
// add tenant io manager
const uint64_t tenant_id = 500;
const uint64_t tenant_id = OB_SERVER_TENANT_ID;
ObTenantIOConfig io_config;
io_config.memory_limit_ = memory_limit;
io_config.callback_thread_count_ = 2;
@ -1825,4 +1825,4 @@ int IOConfModify::modify_tenant_io( const int64_t min_iops,
LOG_WARN("refresh tenant io config failed", K(ret), K(curr_tenant.tenant_id_), K(curr_tenant.config_));
}
return ret;
}
}

View File

@ -54,7 +54,7 @@ public:
void FakeLs(ObLS &ls);
private:
static constexpr uint64_t TEST_TENANT_ID = 500;
static constexpr uint64_t TEST_TENANT_ID = OB_SERVER_TENANT_ID;
ObMetaPointerMap<ObTabletMapKey, ObTablet> tablet_map_;
ObTenantBase tenant_base_;
};