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

Add defense code for trouble shooting

Browse Source
This commit is contained in:
Tyshawn
2023-11-15 02:44:49 +00:00
committed by ob-robot
parent 2df5f811d7
commit 15d42941f7
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,6 +430,12 @@ int ObTablet::init_for_merge(
ddl_kvs_ = ddl_kvs_addr;
ddl_kv_count_ = ddl_kv_count;
ALLOC_AND_INIT(allocator, table_store_addr_, (*this), param, (*old_table_store));
if (OB_UNLIKELY(ddl_kv_count_ != ddl_kv_count
|| ddl_kv_count != table_store_addr_.get_ptr()->get_ddl_memtable_count())) {
// This is defense code. If it runs at here, it must be a bug. And, just abort to preserve the enviroment
// for debugging. Please remove me, after the problem is found.
ob_abort();
}
}
if (FAILEDx(table_store_cache_.init(table_store_addr_.get_ptr()->get_major_sstables(),
@ -5342,6 +5348,8 @@ int64_t ObTablet::to_string(char *buf, const int64_t buf_len) const
KP_(allocator),
K_(tablet_meta),
K_(table_store_cache),
KP_(ddl_kvs),
K_(ddl_kv_count),
K_(table_store_addr),
K_(storage_schema_addr),
K_(next_tablet_guard),

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

@ -83,6 +83,7 @@ public:
}
OB_INLINE bool is_ready_for_read() const { return is_ready_for_read_; }
OB_INLINE int64_t get_table_count() const { return major_tables_.count() + minor_tables_.count(); }
OB_INLINE int64_t get_ddl_memtable_count() const { return ddl_mem_sstables_.count(); }
// Interfaces below that access sstable array member of table store directly does not guarantee
// sstables in array were loaded