hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add allocator tenant label & avoid print error log

Browse Source
This commit is contained in:
yangqise7en
2023-06-05 12:48:29 +00:00
committed by ob-robot
parent 107b73981d
commit e3e9ed5a7d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/compaction/ob_tablet_merge_ctx.cpp
View File

@ -44,7 +44,7 @@ ObTabletMergeInfo::ObTabletMergeInfo()
bloom_filter_block_ctx_(nullptr), bloom_filter_block_ctx_(nullptr),
bloomfilter_block_id_(), bloomfilter_block_id_(),
sstable_merge_info_(), sstable_merge_info_(),
allocator_("MergeContext", OB_MALLOC_MIDDLE_BLOCK_SIZE), allocator_("MergeContext", OB_MALLOC_MIDDLE_BLOCK_SIZE, MTL_ID()),
index_builder_(nullptr) index_builder_(nullptr)
{ {
} }

4
src/storage/compaction/ob_tablet_merge_task.cpp
View File

@ -190,7 +190,7 @@ ObBasicTabletMergeDag::ObBasicTabletMergeDag(
compat_mode_(lib::Worker::CompatMode::INVALID), compat_mode_(lib::Worker::CompatMode::INVALID),
ctx_(nullptr), ctx_(nullptr),
param_(), param_(),
allocator_("MergeDag") allocator_("MergeDag", OB_MALLOC_NORMAL_BLOCK_SIZE, MTL_ID())
{ {
} }
@ -1308,7 +1308,7 @@ int ObTabletMergeFinishTask::try_schedule_compaction_after_mini(
ObTabletMergeTask::ObTabletMergeTask() ObTabletMergeTask::ObTabletMergeTask()
: ObITask(ObITask::TASK_TYPE_MACROMERGE), : ObITask(ObITask::TASK_TYPE_MACROMERGE),
allocator_(), allocator_("MergeTask", OB_MALLOC_NORMAL_BLOCK_SIZE, MTL_ID()),
idx_(0), idx_(0),
ctx_(nullptr), ctx_(nullptr),
merger_(nullptr), merger_(nullptr),

2
src/storage/high_availability/ob_storage_ha_tablet_builder.cpp
View File

@ -842,7 +842,7 @@ int ObStorageHATabletsBuilder::hold_local_reuse_sstable_(
} else if (OB_FAIL(hold_local_complete_tablet_sstable_(tablet, tables_handle))) { } else if (OB_FAIL(hold_local_complete_tablet_sstable_(tablet, tables_handle))) {
LOG_WARN("failed to hold local complete tablet sstable", K(ret), KP(tablet)); LOG_WARN("failed to hold local complete tablet sstable", K(ret), KP(tablet));
} else { } else {
if (!storage_schema.is_valid() if (!storage_schema.is_inited()
|| storage_schema.get_schema_version() < tablet->get_storage_schema().get_schema_version()) { || storage_schema.get_schema_version() < tablet->get_storage_schema().get_schema_version()) {
storage_schema.reset(); storage_schema.reset();
if (OB_FAIL(storage_schema.init(allocator, tablet->get_storage_schema()))) { if (OB_FAIL(storage_schema.init(allocator, tablet->get_storage_schema()))) {

2
src/storage/ob_storage_schema.h
View File

@ -98,7 +98,7 @@ class ObStorageSchema : public share::schema::ObMergeSchema, public memtable::Ob
public: public:
ObStorageSchema(); ObStorageSchema();
virtual ~ObStorageSchema(); virtual ~ObStorageSchema();
bool is_inited() const { return is_inited_; }
int init( int init(
common::ObIAllocator &allocator, common::ObIAllocator &allocator,
const share::schema::ObTableSchema &input_schema, const share::schema::ObTableSchema &input_schema,