fix non-tenant thread malloc with OB_INVALID_TENANT_ID

2023-05-23 12:17:09 +00:00
parent 84b4eec543
commit aa3c922117
1 changed files with 4 additions and 0 deletions
--- a/deps/oblib/src/lib/alloc/ob_malloc_allocator.cpp
+++ b/deps/oblib/src/lib/alloc/ob_malloc_allocator.cpp
@ -112,6 +112,10 @@ void *ObMallocAllocator::alloc(const int64_t size, const oceanbase::lib::ObMemAt
 #else
  const bool do_not_use_me = false;
 #endif
+  if (OB_INVALID_TENANT_ID == inner_attr.tenant_id_) {
+    inner_attr.tenant_id_ = OB_SERVER_TENANT_ID;
+    LOG_ERROR("invalid tenant id", K(attr.tenant_id_), K(inner_attr.tenant_id_), K(ret));
+  }
  if (OB_SUCCESS != ret) {
  } else if (OB_UNLIKELY(0 == inner_attr.tenant_id_)
             || OB_UNLIKELY(INT64_MAX == inner_attr.tenant_id_)) {