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

revert 'support include_hidden_sys when get_tenant_unit'

Browse Source
This commit is contained in:
obdev
2023-06-28 11:12:25 +00:00
committed by ob-robot
parent 68bf34f035
commit 8aee534b66
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mittest/simple_server/test_observer_expand_shrink.cpp
View File

@ -161,7 +161,7 @@ TEST_F(ObserverExpandShink, test_hidden_sys_tenant)
EXPECT_EQ(log_disk_size_in_use, GCTX.log_block_mgr_->min_log_disk_size_for_all_tenants_); EXPECT_EQ(log_disk_size_in_use, GCTX.log_block_mgr_->min_log_disk_size_for_all_tenants_);
share::TenantUnits units; share::TenantUnits units;
EXPECT_EQ(OB_SUCCESS, omt->get_tenant_units(units, true)); EXPECT_EQ(OB_SUCCESS, omt->get_tenant_units(units, false));
EXPECT_EQ(false, units.empty()); EXPECT_EQ(false, units.empty());
bool has_sys_tenant = false; bool has_sys_tenant = false;
int64_t origin_sys_log_disk_size = 0; int64_t origin_sys_log_disk_size = 0;
@ -173,7 +173,7 @@ TEST_F(ObserverExpandShink, test_hidden_sys_tenant)
} }
} }
EXPECT_EQ(OB_SUCCESS, omt->get_tenant_units(units, true)); EXPECT_EQ(OB_SUCCESS, omt->get_tenant_units(units, false));
EXPECT_EQ(false, units.empty()); EXPECT_EQ(false, units.empty());
ObUnitInfoGetter::ObTenantConfig sys_unit_config; ObUnitInfoGetter::ObTenantConfig sys_unit_config;
for (int i = 0; i < units.count(); i++) { for (int i = 0; i < units.count(); i++) {

2
src/observer/omt/ob_tenant_node_balancer.cpp
View File

@ -246,7 +246,7 @@ int ObTenantNodeBalancer::get_server_allocated_resource(ServerResource &server_r
server_resource.reset(); server_resource.reset();
TenantUnits tenant_units; TenantUnits tenant_units;
if (OB_FAIL(omt_->get_tenant_units(tenant_units, true))) { if (OB_FAIL(omt_->get_tenant_units(tenant_units, false))) {
LOG_WARN("failed to get tenant units"); LOG_WARN("failed to get tenant units");
} else { } else {
for (int64_t i = 0; i < tenant_units.count(); i++) { for (int64_t i = 0; i < tenant_units.count(); i++) {