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

add defence for too large ObMigrationTabletParam

Browse Source
This commit is contained in:
wxhwang
2024-02-10 00:20:15 +00:00
committed by ob-robot
parent 78243c1f9a
commit 968ef1f48f
5 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/ob_admin/backup_tool/ob_admin_dump_backup_data_executor.cpp
View File

@ -1557,7 +1557,7 @@ int ObAdminDumpBackupDataExecutor::print_ls_tablet_meta_tablets_()
STORAGE_LOG(WARN, "failed to read tablet metas file trailer", K(ret));
} else {
common::ObArenaAllocator allocator;
const int64_t DEFAULT_BUF_LEN = 2 * 1024 * 1024; // 2M
const int64_t DEFAULT_BUF_LEN = 2 * MAX_BACKUP_TABLET_META_SERIALIZE_SIZE;
int64_t cur_buf_offset = tablet_meta_trailer.offset_;
int64_t cur_total_len = 0;
char *buf = nullptr;
@ -1570,6 +1570,7 @@ int ObAdminDumpBackupDataExecutor::print_ls_tablet_meta_tablets_()
} else if (OB_FAIL(ObAdminDumpBackupDataUtil::pread_file(backup_path_, storage_info_, cur_buf_offset, buf_len, buf))) {
STORAGE_LOG(WARN, "failed to pread file", K(ret), K(backup_path_), K(storage_info_), K(cur_buf_offset), K(buf_len));
} else {
int64_t tablet_cnt = 0;
backup::ObBackupTabletMeta tablet_meta;
blocksstable::ObBufferReader buffer_reader(buf, buf_len);
while (OB_SUCC(ret)) {
@ -1589,7 +1590,12 @@ int ObAdminDumpBackupDataExecutor::print_ls_tablet_meta_tablets_()
STORAGE_LOG(WARN, "common_header is not valid", K(ret), K(backup_path_), K(buffer_reader));
} else if (common_header->data_zlength_ > buffer_reader.remain()) {
cur_total_len = buffer_reader.pos() - sizeof(ObBackupCommonHeader);
STORAGE_LOG(INFO, "buf not enough, wait later", K(cur_total_len), K(buffer_reader));
if (0 == tablet_cnt) {
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "tablet meta is too large", KPC(common_header), K(cur_total_len), K(buffer_reader));
} else {
STORAGE_LOG(INFO, "buf not enough, wait later", KPC(common_header), K(cur_total_len), K(buffer_reader), K(tablet_cnt));
}
break;
} else if (OB_FAIL(common_header->check_data_checksum(buffer_reader.current(), common_header->data_zlength_))) {
STORAGE_LOG(WARN, "failed to check data checksum", K(ret), K(*common_header), K(backup_path_), K(buffer_reader));
@ -1598,6 +1604,7 @@ int ObAdminDumpBackupDataExecutor::print_ls_tablet_meta_tablets_()
} else if (OB_FAIL(buffer_reader.advance(common_header->data_length_ + common_header->align_length_))) {
STORAGE_LOG(WARN, "failed to advance buffer", K(ret));
} else {
++tablet_cnt;
tablet_meta.tablet_id_ = tablet_meta.tablet_meta_.tablet_id_;
if (OB_FAIL(dump_common_header_(*common_header))) {
STORAGE_LOG(WARN, "failed to dump common header", K(ret));