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

[bugfix] fix core on table store deserialize fail

Browse Source
This commit is contained in:
saltonz
2023-06-28 14:42:17 +00:00
committed by ob-robot
parent 7c0c1d66af
commit 3497dbfa19
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/storage/tablet/ob_table_store_util.cpp
View File

@ -263,6 +263,7 @@ int ObSSTableArray::deserialize(
const int64_t ptr_array_size = sizeof(ObSSTable *) * cnt_; const int64_t ptr_array_size = sizeof(ObSSTable *) * cnt_;
const int64_t obj_array_size = sizeof(ObSSTable) * cnt_; const int64_t obj_array_size = sizeof(ObSSTable) * cnt_;
char *buff = nullptr; char *buff = nullptr;
int64_t deserialized_cnt = 0;
if (OB_ISNULL(buff = static_cast<char *>(allocator.alloc(ptr_array_size + obj_array_size)))) { if (OB_ISNULL(buff = static_cast<char *>(allocator.alloc(ptr_array_size + obj_array_size)))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate memory for sstable array", K(ret), K_(cnt), K(ptr_array_size), K(obj_array_size)); LOG_WARN("fail to allocate memory for sstable array", K(ret), K_(cnt), K(ptr_array_size), K(obj_array_size));
@ -273,14 +274,23 @@ int ObSSTableArray::deserialize(
sstable_array_[i] = obj_array + i; sstable_array_[i] = obj_array + i;
if (OB_FAIL(sstable_array_[i]->deserialize(allocator, buf, data_len, pos))) { if (OB_FAIL(sstable_array_[i]->deserialize(allocator, buf, data_len, pos))) {
LOG_WARN("fail to deserialized sstable address", K(ret)); LOG_WARN("fail to deserialized sstable address", K(ret));
} else {
++deserialized_cnt;
} }
} }
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
for (int64_t i = 0; i < deserialized_cnt; ++i) {
ObSSTable *des_sstable = sstable_array_[i];
if (nullptr != des_sstable) {
des_sstable->~ObSSTable();
}
}
if (nullptr != sstable_array_) { if (nullptr != sstable_array_) {
allocator.free(sstable_array_); allocator.free(sstable_array_);
sstable_array_ = nullptr; sstable_array_ = nullptr;
} }
cnt_ = 0;
} else { } else {
is_inited_ = true; is_inited_ = true;
} }