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

add defensive code for col checksum

Browse Source
This commit is contained in:
obdev
2022-12-08 08:11:32 +00:00
committed by ob-robot
parent 75c6144a73
commit ea4e649833
5 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage/blocksstable/ob_index_block_builder.cpp
View File

@ -315,7 +315,8 @@ int ObSSTableMergeRes::fill_column_checksum(
int ret = OB_SUCCESS;
if (OB_UNLIKELY(column_default_checksum.empty() || column_default_checksum.count() < data_column_cnt_)) {
ret = OB_INVALID_ARGUMENT;
STORAGE_LOG(WARN, "invalid argument", K(ret), K(column_default_checksum), K(data_column_cnt_));
STORAGE_LOG(WARN, "invalid argument", K(ret),
K(column_default_checksum.count()), K(data_column_cnt_), K(column_default_checksum));
} else {
if (OB_UNLIKELY(data_column_cnt_ != column_default_checksum.count())) {
STORAGE_LOG(INFO, "column default count doesn't equal to data column count in merge res", K(column_default_checksum.count()), K(data_column_cnt_));

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

@ -161,7 +161,8 @@ public:
const int64_t data_len,
int64_t &pos);
int64_t get_serialize_size() const;
TO_STRING_KV(K_(basic_meta), K_(column_checksums), K_(data_root_info), K_(macro_info), KP_(allocator));
TO_STRING_KV(K_(basic_meta), K_(column_checksums), K(column_checksums_.count()),
K_(data_root_info), K_(macro_info), KP_(allocator));
private:
bool check_meta() const;
int init_base_meta(const ObTabletCreateSSTableParam &param, common::ObIAllocator *allocator);
@ -198,7 +199,8 @@ public:
bool is_valid() const;
void reset();
int assign(const ObMigrationSSTableParam &param);
TO_STRING_KV(K_(basic_meta), K_(column_checksums), K_(column_default_checksums), K_(table_key));
TO_STRING_KV(K_(basic_meta), K(column_checksums_.count()), K(column_default_checksums_.count()),
K_(column_checksums), K_(column_default_checksums), K_(table_key));
private:
static const int64_t MIGRATION_SSTABLE_PARAM_VERSION = 1;
typedef common::ObSEArray<int64_t, common::OB_ROW_DEFAULT_COLUMNS_COUNT> ColChecksumArray;

43
src/storage/tablet/ob_tablet.cpp
View File

@ -168,6 +168,8 @@ int ObTablet::init(
LOG_WARN("failed to build read info", K(ret));
} else if (OB_FAIL(pre_transform_sstable_root_block(*full_read_info_.get_index_read_info()))) {
LOG_WARN("failed to pre-transform sstable root block", K(ret), K(full_read_info_));
} else if (OB_FAIL(check_sstable_column_checksum())) {
LOG_WARN("failed to check sstable column checksum", K(ret), KPC(this));
} else {
is_inited_ = true;
LOG_INFO("succeeded to init tablet", K(ret), KP(this), K(ls_id), K(tablet_id), K(data_tablet_id),
@ -236,6 +238,8 @@ int ObTablet::init(
} else if (OB_FAIL(check_max_sync_schema_version())) {
LOG_WARN("unexpected max sync schema version", K(ret), K(param), K(old_tablet),
K(max_sync_schema_version), K(storage_schema_));
} else if (OB_FAIL(check_sstable_column_checksum())) {
LOG_WARN("failed to check sstable column checksum", K(ret), KPC(this));
} else {
if (old_tablet.get_tablet_meta().has_next_tablet_) {
set_next_tablet_guard(old_tablet.next_tablet_guard_);
@ -300,6 +304,8 @@ int ObTablet::init(
LOG_WARN("failed to pre-transform sstable root block", K(ret), K(full_read_info_));
} else if (OB_FAIL(check_max_sync_schema_version())) {
LOG_WARN("unexpected max sync schema version", K(ret), K(param), K(is_update), K(storage_schema_));
} else if (OB_FAIL(check_sstable_column_checksum())) {
LOG_WARN("failed to check sstable column checksum", K(ret), KPC(this));
} else {
is_inited_ = true;
LOG_INFO("succeeded to init tablet", K(ret), K(param), KPC(this));
@ -346,6 +352,8 @@ int ObTablet::init(
LOG_WARN("fail to build read info", K(ret));
} else if (OB_FAIL(pre_transform_sstable_root_block(*full_read_info_.get_index_read_info()))) {
LOG_WARN("failed to pre-transform sstable root block", K(ret), K(full_read_info_));
} else if (OB_FAIL(check_sstable_column_checksum())) {
LOG_WARN("failed to check sstable column checksum", K(ret), KPC(this));
} else {
if (old_tablet.get_tablet_meta().has_next_tablet_) {
set_next_tablet_guard(old_tablet.next_tablet_guard_);
@ -408,6 +416,8 @@ int ObTablet::init(
LOG_WARN("failed to pre-transform sstable root block", K(ret), K(full_read_info_));
} else if (OB_FAIL(check_max_sync_schema_version())) {
LOG_WARN("unexpected max sync schema version", K(ret), K(param), K(old_tablet), K(storage_schema_));
} else if (OB_FAIL(check_sstable_column_checksum())) {
LOG_WARN("failed to check sstable column checksum", K(ret), KPC(this));
} else {
if (old_tablet.get_tablet_meta().has_next_tablet_) {
set_next_tablet_guard(old_tablet.next_tablet_guard_);
@ -432,6 +442,34 @@ int ObTablet::init(
return ret;
}
int ObTablet::check_sstable_column_checksum() const
{
int ret = OB_SUCCESS;
ObSEArray<ObITable *, MAX_SSTABLE_CNT_IN_STORAGE> sstables;
int64_t schema_col_cnt = 0;
int64_t sstable_col_cnt = 0;
if (OB_UNLIKELY(!table_store_.is_valid() || !storage_schema_.is_valid())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to check tablet ", K(ret), K(table_store_), K(storage_schema_));
} else if (OB_FAIL(storage_schema_.get_stored_column_count_in_sstable(schema_col_cnt))) {
LOG_WARN("failed to get stored column count of storage schema", K(ret), KPC(this));
} else if (OB_FAIL(inner_get_all_sstables(sstables))) {
LOG_WARN("failed to get stored column count of storage schema", K(ret), KPC(this));
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < sstables.count(); ++i) {
ObSSTable *cur = reinterpret_cast<ObSSTable *>(sstables.at(i));
if (OB_ISNULL(cur)) {
ret = OB_ERR_NULL_VALUE;
LOG_WARN("invalid null sstable", K(ret), K(i), KP(cur), KPC(this));
} else if ((sstable_col_cnt = cur->get_meta().get_col_checksum().count()) > schema_col_cnt) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("The storage schema is older than the sstable, and cann’t explain the data.",
K(ret), K(i), K(sstable_col_cnt), K(schema_col_cnt), KPC(cur), K_(storage_schema));
}
}
}
return ret;
}
int ObTablet::serialize(char *buf, const int64_t len, int64_t &pos)
{
int ret = OB_SUCCESS;
@ -1971,6 +2009,11 @@ int ObTablet::build_migration_sstable_param(
} else if (OB_FAIL(ObSSTableMergeRes::fill_column_default_checksum_from_schema(&storage_schema_,
mig_sstable_param.column_default_checksums_))) {
LOG_WARN("fail to assign column default checksums", K(ret), K(storage_schema_));
} else if (OB_UNLIKELY(mig_sstable_param.column_default_checksums_.count()
< mig_sstable_param.column_checksums_.count())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected column count", K(ret),
KP(this), K(mig_sstable_param), K(sstable_meta), K(storage_schema_));
} else {
mig_sstable_param.table_key_ = sstable->get_key();
}

1
src/storage/tablet/ob_tablet.h
View File

@ -460,6 +460,7 @@ private:
int set_tx_data_in_tablet_pointer(const ObTabletTxMultiSourceDataUnit &tx_data);
int get_max_sync_storage_schema_version(int64_t &max_schema_version) const;
int check_max_sync_schema_version() const;
int check_sstable_column_checksum() const;
template<class T>
int dec_unsynced_cnt_for_if_need(

6
src/storage/tablet/ob_tablet_create_delete_helper.cpp
View File

@ -2332,7 +2332,6 @@ int ObTabletCreateDeleteHelper::build_create_sstable_param(
param.data_blocks_cnt_ = 0;
param.micro_block_cnt_ = 0;
param.use_old_macro_block_count_ = 0;
param.column_cnt_ = table_schema.get_column_count() + multi_version_col_cnt;
param.data_checksum_ = 0;
param.occupy_size_ = 0;
param.ddl_scn_.set_min();
@ -2340,7 +2339,10 @@ int ObTabletCreateDeleteHelper::build_create_sstable_param(
param.original_size_ = 0;
param.ddl_scn_.set_min();
param.compressor_type_ = ObCompressorType::NONE_COMPRESSOR;
if (OB_FAIL(ObSSTableMergeRes::fill_column_checksum_for_empty_major(param.column_cnt_,
if (OB_FAIL(table_schema.get_store_column_count(param.column_cnt_, true/*is_full*/))) {
LOG_WARN("fail to get stored col cnt of table schema", K(ret), K(table_schema));
} else if (FALSE_IT(param.column_cnt_ += multi_version_col_cnt)) {
} else if (OB_FAIL(ObSSTableMergeRes::fill_column_checksum_for_empty_major(param.column_cnt_,
param.column_checksums_))) {
LOG_WARN("fail to fill column checksum for empty major", K(ret), K(param));
}