From 4c03c7163ee63833ea9dce632ff80f7875c19b62 Mon Sep 17 00:00:00 2001
From: hf0 <hf0@oceanbase.com>
Date: Tue, 31 Aug 2021 14:46:12 +0800
Subject: [PATCH] fix tenant allocator not inited issue during restart.

---
 src/observer/omt/ob_tenant_node_balancer.cpp  |  8 ++
 .../ob_tenant_mutil_allocator_mgr.cpp         | 84 ++++++++++---------
 2 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/observer/omt/ob_tenant_node_balancer.cpp b/src/observer/omt/ob_tenant_node_balancer.cpp
index 4786eff79d..34f0a8e132 100644
--- a/src/observer/omt/ob_tenant_node_balancer.cpp
+++ b/src/observer/omt/ob_tenant_node_balancer.cpp
@@ -118,6 +118,14 @@ int ObTenantNodeBalancer::update_tenant(TenantUnits& units, const bool is_local)
     omt_->set_synced();
   }
 
+  // This func is called when restart(is_local=true) or run1(is_local=false).
+  // So we need update tenant allocator here.
+  if (OB_SUCCESS != (tmp_ret = TMA_MGR_INSTANCE.update_tenant_mem_limit(units))) {
+    LOG_WARN("TMA_MGR_INSTANCE.update_tenant_mem_limit failed", K(tmp_ret));
+  } else {
+    LOG_INFO("TMA_MGR_INSTANCE.update_tenant_mem_limit success", K(units), K(is_local));
+  }
+
   if (OB_FAIL(check_del_tenant(units))) {
     tmp_ret = ret;
     LOG_WARN("check delete tenant fail", K(ret));
diff --git a/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp b/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp
index 8de77b6e67..bd82e55815 100644
--- a/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp
+++ b/src/share/allocator/ob_tenant_mutil_allocator_mgr.cpp
@@ -286,49 +286,53 @@ int ObTenantMutilAllocatorMgr::update_tenant_mem_limit(const share::TenantUnits&
         nway = 1;
       }
       const int64_t max_memory = tenant_config.config_.max_memory_;
-      int64_t new_tma_limit = max_memory;
-      if (has_memstore) {
-        // If the unit type of tenant is not Log, need to subtract
-        // the reserved memory of memstore
-        if (cur_memstore_limit_percent > 100 || cur_memstore_limit_percent <= 0) {
-          OB_LOG(WARN, "memstore_limit_percentage val is unexpected", K(cur_memstore_limit_percent));
+      if (max_memory <= 0) {
+        // tenant config is invalid, skip
+      } else {
+        int64_t new_tma_limit = max_memory;
+        if (has_memstore) {
+          // If the unit type of tenant is not Log, need to subtract
+          // the reserved memory of memstore
+          if (cur_memstore_limit_percent > 100 || cur_memstore_limit_percent <= 0) {
+            OB_LOG(WARN, "memstore_limit_percentage val is unexpected", K(cur_memstore_limit_percent));
+          } else {
+            new_tma_limit = max_memory / 100 * (100 - cur_memstore_limit_percent);
+          }
+        }
+        int tmp_ret = OB_SUCCESS;
+        ObTenantMutilAllocator *tma = NULL;
+        if (OB_SUCCESS != (tmp_ret = get_tenant_mutil_allocator(tenant_id, tma))) {
+          OB_LOG(WARN, "get_tenant_mutil_allocator failed", K(tmp_ret), K(tenant_id));
+        } else if (NULL == tma) {
+          OB_LOG(WARN, "get_tenant_mutil_allocator failed", K(tenant_id));
         } else {
-          new_tma_limit = max_memory / 100 * (100 - cur_memstore_limit_percent);
+          tma->set_nway(nway);
+          int64_t pre_tma_limit = tma->get_limit();
+          if (pre_tma_limit != new_tma_limit) {
+            tma->set_limit(new_tma_limit);
+          }
+          OB_LOG(INFO,
+              "ObTenantMutilAllocator update tenant mem_limit finished",
+              K(ret),
+              K(tenant_id),
+              K(nway),
+              K(new_tma_limit),
+              K(pre_tma_limit),
+              K(cur_memstore_limit_percent),
+              K(tenant_config));
         }
-      }
-      int tmp_ret = OB_SUCCESS;
-      ObTenantMutilAllocator* tma = NULL;
-      if (OB_SUCCESS != (tmp_ret = get_tenant_mutil_allocator(tenant_id, tma))) {
-        OB_LOG(WARN, "get_tenant_mutil_allocator failed", K(tmp_ret), K(tenant_id));
-      } else if (NULL == tma) {
-        OB_LOG(WARN, "get_tenant_mutil_allocator failed", K(tenant_id));
-      } else {
-        tma->set_nway(nway);
-        int64_t pre_tma_limit = tma->get_limit();
-        if (pre_tma_limit != new_tma_limit) {
-          tma->set_limit(new_tma_limit);
-        }
-        OB_LOG(INFO,
-            "ObTenantMutilAllocator update tenant mem_limit finished",
-            K(ret),
-            K(tenant_id),
-            K(nway),
-            K(new_tma_limit),
-            K(pre_tma_limit),
-            K(cur_memstore_limit_percent),
-            K(tenant_config));
-      }
 
-      // update memstore threshold of GmemstoreAllocator
-      ObGMemstoreAllocator* memstore_allocator = NULL;
-      if (OB_SUCCESS != (tmp_ret = ObMemstoreAllocatorMgr::get_instance().get_tenant_memstore_allocator(
-                             tenant_id, memstore_allocator))) {
-      } else if (OB_ISNULL(memstore_allocator)) {
-        OB_LOG(WARN, "get_tenant_mutil_allocator failed", K(tenant_id));
-      } else if (OB_FAIL(memstore_allocator->set_memstore_threshold(tenant_id))) {
-        OB_LOG(WARN, "failed to set_memstore_threshold of memstore allocator", K(tenant_id), K(ret));
-      } else {
-        OB_LOG(INFO, "succ to set_memstore_threshold of memstore allocator", K(tenant_id), K(ret));
+        // update memstore threshold of GmemstoreAllocator
+        ObGMemstoreAllocator *memstore_allocator = NULL;
+        if (OB_SUCCESS != (tmp_ret = ObMemstoreAllocatorMgr::get_instance().get_tenant_memstore_allocator(
+                               tenant_id, memstore_allocator))) {
+        } else if (OB_ISNULL(memstore_allocator)) {
+          OB_LOG(WARN, "get_tenant_mutil_allocator failed", K(tenant_id));
+        } else if (OB_FAIL(memstore_allocator->set_memstore_threshold(tenant_id))) {
+          OB_LOG(WARN, "failed to set_memstore_threshold of memstore allocator", K(tenant_id), K(ret));
+        } else {
+          OB_LOG(INFO, "succ to set_memstore_threshold of memstore allocator", K(tenant_id), K(ret));
+        }
       }
     }
   }