Skip to content

[bugfix](tablet)fix the tablet will be deleted when clone due to concurrency #26777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaokang merged 8 commits into from
Nov 17, 2023
Merged

[bugfix](tablet)fix the tablet will be deleted when clone due to concurrency #26777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f392eb1
fix the tablet will be deleted when clone due to concurrency
neuyilan Oct 24, 2023
9866d89
fix the tablet will be deleted when clone due to concurrency
neuyilan Oct 24, 2023
3537b2e
fix the tablet will be deleted when clone due to concurrency
neuyilan Oct 24, 2023
a903425
fix the tablet will be deleted when clone due to concurrency
neuyilan Oct 25, 2023
dc43a2f
fix the tablet will be deleted when clone due to concurrency
neuyilan Oct 25, 2023
60fc931
fix the tablet will be deleted when clone due to concurrency
neuyilan Oct 25, 2023
3f24e2c
Merge branch 'branch-2.0' into dev_qhl_branch2.0_fix_tablet_delete
xiaokang Nov 16, 2023
6ca4778
Merge branch 'branch-2.0' into dev_qhl_branch2.0_fix_tablet_delete
xiaokang Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion be/src/agent/task_worker_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,9 +1883,10 @@ void CloneTaskPool::_clone_worker_thread_callback() {
LOG_INFO("successfully clone tablet")
.tag("signature", agent_task_req.signature)
.tag("tablet_id", clone_req.tablet_id);
++_s_report_version;
finish_task_request.__set_finish_tablet_infos(tablet_infos);
}

finish_task_request.__set_report_version(_s_report_version);
_finish_task(finish_task_request);
_remove_task_info(agent_task_req.task_type, agent_task_req.signature);
}
Expand Down
6 changes: 5 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/master/MasterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,11 @@ private void finishClone(AgentTask task, TFinishTaskRequest request) {
} else {
LOG.warn("invalid clone task, ignore it. {}", task);
}

if (request.isSetReportVersion()) {
long reportVersion = request.getReportVersion();
Env.getCurrentSystemInfo().updateBackendReportVersion(
task.getBackendId(), reportVersion, task.getDbId(), task.getTableId());
}
AgentTaskQueue.removeTask(task.getBackendId(), TTaskType.CLONE, task.getSignature());
}

Expand Down
7 changes: 4 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,16 +770,17 @@ private static void deleteFromMeta(ListMultimap<Long, Long> tabletDeleteFromMeta
continue;
}

BinlogConfig binlogConfig = new BinlogConfig(olapTable.getBinlogConfig());

ReplicaState state = replica.getState();

// check report version again
long currentBackendReportVersion = Env.getCurrentSystemInfo()
.getBackendReportVersion(backendId);
if (backendReportVersion < currentBackendReportVersion) {
continue;
}

BinlogConfig binlogConfig = new BinlogConfig(olapTable.getBinlogConfig());

ReplicaState state = replica.getState();
if (state == ReplicaState.NORMAL || state == ReplicaState.SCHEMA_CHANGE) {
// if state is PENDING / ROLLUP / CLONE
// it's normal that the replica is not created in BE but exists in meta.
Expand Down