database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Bug](cooldown) set new replica id when early exit in doing clone when no missed versions (#16644)

Browse Source 
* set new replica id

* reduce lock

* reset when replica id is different
This commit is contained in:
AlexYue
2023-02-13 14:39:03 +08:00
committed by GitHub
parent be9385d40a
commit 8317c4a752
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
be/src/olap/tablet_meta.h
View File

@ -120,6 +120,7 @@ public:
int64_t partition_id() const;
int64_t tablet_id() const;
int64_t replica_id() const;
void set_replica_id(int64_t replica_id);
int32_t schema_hash() const;
int16_t shard_id() const;
void set_shard_id(int32_t shard_id);
@ -435,6 +436,10 @@ inline int64_t TabletMeta::replica_id() const {
return _replica_id;
}
inline void TabletMeta::set_replica_id(int64_t replica_id) {
_replica_id = replica_id;
}
inline int32_t TabletMeta::schema_hash() const {
return _schema_hash;
}

12
be/src/olap/task/engine_clone_task.cpp
View File

@ -98,6 +98,14 @@ Status EngineCloneTask::_do_clone() {
if (missed_versions.empty()) {
LOG(INFO) << "missed version size = 0, skip clone and return success. tablet_id="
<< _clone_req.tablet_id << " req replica=" << _clone_req.replica_id;
if (_clone_req.replica_id != tablet->replica_id()) {
// update replica id to meet cooldown replica
tablet->tablet_meta()->set_replica_id(_clone_req.replica_id);
{
std::shared_lock rlock(tablet->get_header_lock());
tablet->save_meta();
}
}
_set_tablet_info(is_new_tablet);
return Status::OK();
}
@ -204,7 +212,7 @@ Status EngineCloneTask::_set_tablet_info(bool is_new_tablet) {
/// This method will do following things:
/// 1. Make snapshots on source BE.
/// 2. Download all snapshots to CLONE dir.
/// 3. Convert rowset ids of downloaded snapshots.
/// 3. Convert rowset ids of downloaded snapshots(would also change the replica id).
/// 4. Release the snapshots on source BE.
Status EngineCloneTask::_make_and_download_snapshots(DataDir& data_dir,
const std::string& local_data_path,
@ -540,7 +548,7 @@ Status EngineCloneTask::_finish_incremental_clone(Tablet* tablet,
int64_t committed_version) {
LOG(INFO) << "begin to finish incremental clone. tablet=" << tablet->full_name()
<< ", committed_version=" << committed_version
<< ", cloned_tablet_replica_id=" << cloned_tablet_meta.tablet_id();
<< ", cloned_tablet_replica_id=" << cloned_tablet_meta.replica_id();
/// Get missing versions again from local tablet.
/// We got it before outside the lock, so it has to be got again.