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

Fix migration using 500 tenant memory and mod

Browse Source
This commit is contained in:
godyangfight
2023-08-15 07:14:57 +00:00
committed by ob-robot
parent adbd94ded3
commit 1cadc34c90
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/blocksstable/ob_sstable_meta.cpp
View File

@ -714,10 +714,11 @@ int ObSSTableMeta::deep_copy(
//================================== ObMigrationSSTableParam ================================== //================================== ObMigrationSSTableParam ==================================
ObMigrationSSTableParam::ObMigrationSSTableParam() ObMigrationSSTableParam::ObMigrationSSTableParam()
: basic_meta_(), : allocator_("SSTableParam", OB_MALLOC_NORMAL_BLOCK_SIZE, MTL_ID()),
column_checksums_(), basic_meta_(),
column_checksums_(OB_MALLOC_NORMAL_BLOCK_SIZE, ModulePageAllocator(allocator_)),
table_key_(), table_key_(),
column_default_checksums_(), column_default_checksums_(OB_MALLOC_NORMAL_BLOCK_SIZE, ModulePageAllocator(allocator_)),
is_small_sstable_(false) is_small_sstable_(false)
{ {
} }
@ -734,6 +735,7 @@ void ObMigrationSSTableParam::reset()
column_default_checksums_.reset(); column_default_checksums_.reset();
basic_meta_.reset(); basic_meta_.reset();
is_small_sstable_ = false; is_small_sstable_ = false;
allocator_.reset();
} }
bool ObMigrationSSTableParam::is_valid() const bool ObMigrationSSTableParam::is_valid() const

1
src/storage/blocksstable/ob_sstable_meta.h
View File

@ -280,6 +280,7 @@ private:
static const int64_t MIGRATION_SSTABLE_PARAM_VERSION = 1; static const int64_t MIGRATION_SSTABLE_PARAM_VERSION = 1;
typedef common::ObSEArray<int64_t, common::OB_ROW_DEFAULT_COLUMNS_COUNT> ColChecksumArray; typedef common::ObSEArray<int64_t, common::OB_ROW_DEFAULT_COLUMNS_COUNT> ColChecksumArray;
public: public:
common::ObArenaAllocator allocator_;
ObSSTableBasicMeta basic_meta_; ObSSTableBasicMeta basic_meta_;
ColChecksumArray column_checksums_; ColChecksumArray column_checksums_;
storage::ObITable::TableKey table_key_; storage::ObITable::TableKey table_key_;

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

@ -1474,12 +1474,15 @@ ObStorageHATableInfoMgr::ObStorageHATabletTableInfoMgr::ObStorageHATabletTableIn
: is_inited_(false), : is_inited_(false),
tablet_id_(), tablet_id_(),
status_(ObCopyTabletStatus::MAX_STATUS), status_(ObCopyTabletStatus::MAX_STATUS),
copy_table_info_array_() allocator_("HATableInfo", OB_MALLOC_NORMAL_BLOCK_SIZE, MTL_ID()),
copy_table_info_array_(OB_MALLOC_NORMAL_BLOCK_SIZE, ModulePageAllocator(allocator_)),
tablet_meta_()
{ {
} }
ObStorageHATableInfoMgr::ObStorageHATabletTableInfoMgr::~ObStorageHATabletTableInfoMgr() ObStorageHATableInfoMgr::ObStorageHATabletTableInfoMgr::~ObStorageHATabletTableInfoMgr()
{ {
allocator_.reset();
} }
int ObStorageHATableInfoMgr::ObStorageHATabletTableInfoMgr::init( int ObStorageHATableInfoMgr::ObStorageHATabletTableInfoMgr::init(

1
src/storage/high_availability/ob_storage_ha_tablet_builder.h
View File

@ -225,6 +225,7 @@ public:
bool is_inited_; bool is_inited_;
common::ObTabletID tablet_id_; common::ObTabletID tablet_id_;
storage::ObCopyTabletStatus::STATUS status_; storage::ObCopyTabletStatus::STATUS status_;
common::ObArenaAllocator allocator_;
common::ObArray<blocksstable::ObMigrationSSTableParam> copy_table_info_array_; common::ObArray<blocksstable::ObMigrationSSTableParam> copy_table_info_array_;
ObMigrationTabletParam tablet_meta_; ObMigrationTabletParam tablet_meta_;
DISALLOW_COPY_AND_ASSIGN(ObStorageHATabletTableInfoMgr); DISALLOW_COPY_AND_ASSIGN(ObStorageHATabletTableInfoMgr);