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

add defence for backup that parallel external sort return duplicate item

Browse Source
This commit is contained in:
oceanoverflow
2023-02-21 09:14:25 +00:00
committed by ob-robot
parent 2d4ebc458c
commit e2fd831532
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/storage/backup/ob_backup_utils.cpp
View File

@ -1422,7 +1422,9 @@ ObBackupTabletProvider::ObBackupTabletProvider()
index_kv_cache_(NULL), index_kv_cache_(NULL),
sql_proxy_(NULL), sql_proxy_(NULL),
backup_item_cmp_(sort_ret_), backup_item_cmp_(sort_ret_),
meta_index_store_() meta_index_store_(),
prev_item_(),
has_prev_item_(false)
{} {}
ObBackupTabletProvider::~ObBackupTabletProvider() ObBackupTabletProvider::~ObBackupTabletProvider()
@ -1576,6 +1578,12 @@ int ObBackupTabletProvider::inner_get_batch_items_(
LOG_WARN("next item is not valid", K(ret), KPC(next_item)); LOG_WARN("next item is not valid", K(ret), KPC(next_item));
} else if (OB_FAIL(items.push_back(*next_item))) { } else if (OB_FAIL(items.push_back(*next_item))) {
LOG_WARN("failed to push back", K(ret), K(next_item)); LOG_WARN("failed to push back", K(ret), K(next_item));
} else if (has_prev_item_ && OB_FAIL(compare_prev_item_(*next_item))) {
LOG_WARN("failed to compare prev item", K(ret), K(prev_item_), KPC(next_item));
} else {
has_prev_item_ = true;
prev_item_ = *next_item;
} }
} }
LOG_INFO("inner get batch item", K(items), K_(backup_data_type)); LOG_INFO("inner get batch item", K(items), K_(backup_data_type));
@ -2171,6 +2179,23 @@ int ObBackupTabletProvider::check_tablet_replica_validity_(const uint64_t tenant
return ret; return ret;
} }
int ObBackupTabletProvider::compare_prev_item_(const ObBackupProviderItem &cur_item)
{
int ret = OB_SUCCESS;
ObBackupProviderItemCompare compare(ret);
compare.set_backup_data_type(backup_data_type_);
bool bret = compare(&prev_item_, &cur_item); // check if smaller
if (!bret) {
if (prev_item_ == cur_item && PROVIDER_ITEM_MACRO_ID == cur_item.get_item_type()) {
// macro id might be same
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("comparing item not match", K(ret), K(prev_item_), K(cur_item));
}
}
return ret;
}
/* ObBackupMacroBlockTaskMgr */ /* ObBackupMacroBlockTaskMgr */
ObBackupMacroBlockTaskMgr::ObBackupMacroBlockTaskMgr() ObBackupMacroBlockTaskMgr::ObBackupMacroBlockTaskMgr()

3
src/storage/backup/ob_backup_utils.h
View File

@ -295,6 +295,7 @@ private:
int get_tenant_meta_index_retry_id_(const share::ObBackupDataType &backup_data_type, int64_t &retry_id); int get_tenant_meta_index_retry_id_(const share::ObBackupDataType &backup_data_type, int64_t &retry_id);
int check_tablet_replica_validity_(const uint64_t tenant_id, const share::ObLSID &ls_id, int check_tablet_replica_validity_(const uint64_t tenant_id, const share::ObLSID &ls_id,
const common::ObTabletID &tablet_id, const share::ObBackupDataType &backup_data_type); const common::ObTabletID &tablet_id, const share::ObBackupDataType &backup_data_type);
int compare_prev_item_(const ObBackupProviderItem &item);
private: private:
static const int64_t BATCH_SIZE = 2000; static const int64_t BATCH_SIZE = 2000;
@ -319,6 +320,8 @@ private:
common::ObMySQLProxy *sql_proxy_; common::ObMySQLProxy *sql_proxy_;
ObBackupProviderItemCompare backup_item_cmp_; ObBackupProviderItemCompare backup_item_cmp_;
ObBackupMetaIndexStore meta_index_store_; ObBackupMetaIndexStore meta_index_store_;
ObBackupProviderItem prev_item_;
bool has_prev_item_;
DISALLOW_COPY_AND_ASSIGN(ObBackupTabletProvider); DISALLOW_COPY_AND_ASSIGN(ObBackupTabletProvider);
}; };