From 48881afc22969cb88d26f61c0f8cb1e8c08ee498 Mon Sep 17 00:00:00 2001 From: zhjc1124 Date: Thu, 30 May 2024 14:24:59 +0000 Subject: [PATCH] [CP] update_tenant_memory after create_tenant instantly --- src/observer/omt/ob_tenant_node_balancer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/observer/omt/ob_tenant_node_balancer.cpp b/src/observer/omt/ob_tenant_node_balancer.cpp index c07d4570e..2f1220933 100644 --- a/src/observer/omt/ob_tenant_node_balancer.cpp +++ b/src/observer/omt/ob_tenant_node_balancer.cpp @@ -398,10 +398,15 @@ int ObTenantNodeBalancer::check_new_tenant( LOG_WARN("fail to create new tenant", K(ret), K(tenant_id)); } } - } else { + } + + if (OB_SUCC(ret)) { + if (OB_ISNULL(tenant)) { + ret = omt_->get_tenant(tenant_id, tenant); + } int64_t extra_memory = 0; if (is_sys_tenant(tenant_id)) { - if (tenant->is_hidden() && OB_FAIL(omt_->convert_hidden_to_real_sys_tenant(unit, abs_timeout_us))) { + if (OB_SUCC(ret) && tenant->is_hidden() && OB_FAIL(omt_->convert_hidden_to_real_sys_tenant(unit, abs_timeout_us))) { LOG_WARN("fail to create real sys tenant", K(unit)); } extra_memory = GMEMCONF.get_extra_memory(); @@ -415,6 +420,7 @@ int ObTenantNodeBalancer::check_new_tenant( LOG_ERROR("fail to update tenant memory", K(ret), K(tenant_id)); } } + if (OB_SUCC(ret) && !is_virtual_tenant_id(tenant_id)) { if (OB_FAIL(omt_->modify_tenant_io(tenant_id, unit.config_))) { LOG_WARN("modify tenant io config failed", K(ret), K(tenant_id), K(unit.config_));