[CP] [CP] fix MemLeak DeadLock

deps/oblib/src/lib/allocator/ob_mem_leak_checker.cpp

@@ -18,6 +18,7 @@ namespace oceanbase
 namespace common
 {
 lib::ObSimpleRateLimiter ObMemLeakChecker::rl_ = {INT64_MAX};
+constexpr const char ObMemLeakChecker::MOD_INFO_MAP_STR[];
 
 } // end of namespace common
 } // end of namespace oceanbase

deps/oblib/src/lib/allocator/ob_mem_leak_checker.h

@@ -24,6 +24,7 @@ namespace common
 {
 class ObMemLeakChecker
 {
+  static constexpr const char MOD_INFO_MAP_STR[] =  "leakInfoMap";
   struct PtrKey
   {
     void *ptr_;
@@ -59,7 +60,26 @@ class ObMemLeakChecker
   typedef hash::ObHashMap<PtrKey, Info> mod_alloc_info_t;
 
 public:
-  typedef hash::ObHashMap<Info, std::pair<int64_t, int64_t>> mod_info_map_t;
+
+  class mod_info_map_t
+  {
+    public:
+      typedef hash::ObHashMap<Info, std::pair<int64_t, int64_t>> hashmap;
+      int create(int64_t bucket_num)
+      {
+        ObMemAttr attr(common::OB_SERVER_TENANT_ID, MOD_INFO_MAP_STR, ObCtxIds::DEFAULT_CTX_ID,
+                      lib::OB_HIGH_ALLOC);
+        return map_.create(bucket_num, attr, attr);
+      }
+
+      hashmap *operator->()
+      {
+        return &map_;
+      }
+    private:
+      hashmap map_;
+  };
+
   using TCharArray = char[2 * lib::AOBJECT_LABEL_SIZE + 1];
 
   ObMemLeakChecker()
@@ -103,6 +123,8 @@ public:
     if (nullptr == str || 0 == STRLEN(str) || 0 == STRNCMP(str, "NONE", STRLEN("NONE"))) {
       origin_str_[0] = '\0';
       tmp_ct = NOCHECK;
+    } else if (0 == STRNCMP(str, MOD_INFO_MAP_STR, strlen(MOD_INFO_MAP_STR))) {
+       // ensure leak_mod is different from the mod_info_map's label
     } else {
       STRNCPY(origin_str_, str, sizeof(origin_str_));
       origin_str_[sizeof(origin_str_) - 1] = '\0';
@@ -178,7 +200,7 @@ public:
     }
   }
 
-  int load_leak_info_map(hash::ObHashMap<Info, std::pair<int64_t, int64_t>> &info_map)
+  int load_leak_info_map(mod_info_map_t &info_map)
   {
     int ret = OB_SUCCESS;
     using hashtable = mod_alloc_info_t::hashtable;
@@ -190,14 +212,14 @@ public:
       while (node_it != bucket_it->node_end()) {
         std::pair<int64_t, int64_t> item;
         //_OB_LOG(INFO, "hash value, bt=%s, hash=%lu", it->second.bt_, it->second.hash());
-        ret = info_map.get_refactored(node_it->second, item);
+        ret = info_map->get_refactored(node_it->second, item);
         if (OB_FAIL(ret) && OB_HASH_NOT_EXIST != ret) {
           _OB_LOG(INFO, "LEAK_CHECKER, ptr=%p bt=%s", node_it->first.ptr_, node_it->second.bt_);
         } else {
           if (OB_SUCC(ret)) {
             item.first += 1;
             item.second += node_it->second.bytes_;
-            if (OB_FAIL(info_map.set_refactored(node_it->second, item, 1, 0, 1))) {
+            if (OB_FAIL(info_map->set_refactored(node_it->second, item, 1, 0, 1))) {
               _OB_LOG(WARN, "failed to aggregate memory size, ret=%d", ret);
             } else {
               _OB_LOG(DEBUG, "LEAK_CHECKER hash updated");
@@ -205,7 +227,7 @@ public:
           } else {
             item.first = 1;
             item.second = node_it->second.bytes_;
-            if (OB_FAIL(info_map.set_refactored(node_it->second, item, 1, 0, 0))) {
+            if (OB_FAIL(info_map->set_refactored(node_it->second, item, 1, 0, 0))) {
               _OB_LOG(WARN, "failed to aggregate memory size, ret=%d", ret);
             } else {
               _OB_LOG(DEBUG, "LEAK_CHECKER hash inserted");
@@ -220,11 +242,8 @@ public:
   }
   void print()
   {
-    ObMemAttr attr(common::OB_SERVER_TENANT_ID, "leakInfoMap", ObCtxIds::DEFAULT_CTX_ID,
+    mod_info_map_t tmp_map;
-                   lib::OB_HIGH_ALLOC);
+    int ret = tmp_map.create(10000);
-    using Hash = hash::ObHashMap<Info, std::pair<int64_t, int64_t>>;
-    Hash tmp_map;
-    int ret = tmp_map.create(10000, attr, attr);
     if (OB_FAIL(ret)) {
       _OB_LOG(ERROR, "failed to create hashmap, err=%d", ret);
     } else if (OB_FAIL(load_leak_info_map(tmp_map))) {
@@ -232,8 +251,8 @@ public:
     } else {
       _OB_LOG(INFO, "######## LEAK_CHECKER (str = %s)########", origin_str_);
 
-      Hash::const_iterator jt = tmp_map.begin();
+      mod_info_map_t::hashmap::const_iterator jt = tmp_map->begin();
-      for (; jt != tmp_map.end(); ++jt)
+      for (; jt != tmp_map->end(); ++jt)
       {
         _OB_LOG(INFO, "[LC] bt=%s, count=%ld, bytes=%ld",
                 jt->first.bt_, jt->second.first, jt->second.second);

src/observer/ob_dump_task_generator.cpp

@@ -178,7 +178,7 @@ void ObDumpTaskGenerator::dump_memory_leak()
       LOG_WARN("alloc failed", K(ret));
     } else {
       common::ObMemLeakChecker::mod_info_map_t tmp_map;
-      if (OB_FAIL(tmp_map.create(1024, attr, attr))) {
+      if (OB_FAIL(tmp_map.create(1024))) {
         LOG_WARN("create map failed", K(ret));
       } else if (OB_FAIL(get_mem_leak_checker().load_leak_info_map(tmp_map))) {
         LOG_WARN("load map failed", K(ret));
@@ -191,7 +191,7 @@ void ObDumpTaskGenerator::dump_memory_leak()
                         get_mem_leak_checker().get_label(),
                         get_mem_leak_checker().get_check_type(),
                         ObTimeUtility::current_time());
-        for (auto it = tmp_map.begin(); it != tmp_map.end(); ++it) {
+        for (auto it = tmp_map->begin(); it != tmp_map->end(); ++it) {
           pos += snprintf(buf + pos, buf_len - pos, "bt=%s, count=%ld, bytes=%ld\n",
               it->first.bt_, it->second.first, it->second.second);
           if (pos > buf_len / 2) {

src/observer/virtual_table/ob_mem_leak_checker_info.cpp

@@ -62,19 +62,19 @@ int ObMemLeakCheckerInfo::inner_get_next_row(common::ObNewRow *&row)
   if (OB_FAIL(sanity_check())) {
     // error
   } else if (!opened_) {
-    int ret = info_map_.create(10000, ObModIds::TEST);
+    int ret = info_map_.create(10000);
     if (OB_FAIL(ret)) {
       SERVER_LOG(WARN, "failed to create hashmap", K(ret));
     } else if (OB_FAIL(leak_checker_->load_leak_info_map(info_map_))) {
       SERVER_LOG(WARN, "failed to collection leak info", K(ret));
     } else {
       opened_ = true;
-      it_ = info_map_.begin();
+      it_ = info_map_->begin();
     }
   }
 
   if (OB_SUCC(ret)) {
-    if (it_ != info_map_.end()) {
+    if (it_ != info_map_->end()) {
       if (OB_FAIL(fill_row(row))) {
         SERVER_LOG(WARN, "failed to fill row", K(ret));
       }

src/observer/virtual_table/ob_mem_leak_checker_info.h

@@ -46,7 +46,7 @@ private:
 private:
   bool opened_;
   common::ObMemLeakChecker *leak_checker_;
-  common::ObMemLeakChecker::mod_info_map_t::const_iterator it_;
+  common::ObMemLeakChecker::mod_info_map_t::hashmap::const_iterator it_;
   common::ObMemLeakChecker::mod_info_map_t info_map_;
   common::ObAddr *addr_;
   uint64_t tenant_id_;