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

[CP] Fix batch create partitions rollback core

Browse Source
This commit is contained in:
JiahuaChen
2022-04-25 14:20:31 +08:00
committed by wangzelin.wzl
parent 8ce40d33af
commit 25b3b3fff8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ob_partition_group.cpp
View File

@ -3148,7 +3148,7 @@ int ObPartitionGroup::check_can_do_merge(bool& can_merge, bool& need_merge)
ObReplicaType ObPartitionGroup::get_replica_type() const ObReplicaType ObPartitionGroup::get_replica_type() const
{ {
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
ObReplicaType replica_type; ObReplicaType replica_type = ObReplicaType::REPLICA_TYPE_MAX;
if (OB_SUCCESS != (tmp_ret = pg_storage_.get_replica_type(replica_type))) { if (OB_SUCCESS != (tmp_ret = pg_storage_.get_replica_type(replica_type))) {
STORAGE_LOG(WARN, "get replica_type error", K(tmp_ret), K_(pkey), K(replica_type)); STORAGE_LOG(WARN, "get replica_type error", K(tmp_ret), K_(pkey), K(replica_type));

5
src/storage/ob_pg_storage.cpp
View File

@ -2249,8 +2249,13 @@ ObReplicaType ObPGStorage::get_replica_type_() const
int ObPGStorage::get_replica_type(common::ObReplicaType& replica_type) const int ObPGStorage::get_replica_type(common::ObReplicaType& replica_type) const
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (!is_inited_) {
ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "partition is not initialized", K_(pkey), K(ret));
} else {
TCRLockGuard lock_guard(lock_); TCRLockGuard lock_guard(lock_);
replica_type = meta_->replica_type_; replica_type = meta_->replica_type_;
}
return ret; return ret;
} }