From 6b3f3631fdba62ed6f41bae491dcd76174ef4255 Mon Sep 17 00:00:00 2001 From: nroskill Date: Mon, 22 May 2023 04:17:04 +0000 Subject: [PATCH] [CP] fix wrong label in ModulePageAllocator --- deps/oblib/src/lib/allocator/page_arena.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deps/oblib/src/lib/allocator/page_arena.h b/deps/oblib/src/lib/allocator/page_arena.h index aad9b9d085..e0182c414f 100644 --- a/deps/oblib/src/lib/allocator/page_arena.h +++ b/deps/oblib/src/lib/allocator/page_arena.h @@ -101,7 +101,11 @@ struct ModulePageAllocator: public ObIAllocator lib::ObLabel get_label() const { return attr_.label_; } void *alloc(const int64_t sz) { - return alloc(sz, attr_); + return (nullptr != allocator_ + && !attr_.label_.is_valid() + && OB_SERVER_TENANT_ID == attr_.tenant_id_ + && 0 == attr_.ctx_id_) + ? allocator_->alloc(sz) : alloc(sz, attr_); } void *alloc(const int64_t size, const ObMemAttr &attr) {