Skip to content
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.

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

[Feature] Support Cluster Snapshot Backup: checkpoint and image backup (part3) (backport #54695) #54982

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 13, 2025

What I'm doing:

This is part3 for supporting cluster snapshot backport for share data mode.

In this pr, we introduce a new checkpoint scheduler to finish the image backup:

  1. Introduce ClusterSnapshotCheckpointScheduler to control the creation of the imgae
    for FE and StarMgr in the same thread with consistent journal ids between two image.
  2. ClusterSnapshotCheckpointController should be exclusive with the normal checkpoint.

Fixes #53867
#53867

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

…p (part3) (#54695)

Signed-off-by: srlch <[email protected]>
(cherry picked from commit e332116)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java
#	fe/fe-core/src/test/java/com/starrocks/lake/ClusterSnapshotTest.java
Copy link
Contributor Author

mergify bot commented Jan 13, 2025

Cherry-pick of e332116 has failed:

On branch mergify/bp/branch-3.4/pr-54695
Your branch is up to date with 'origin/branch-3.4'.

You are currently cherry-picking commit e33211689.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   be/src/exec/schema_scanner/schema_cluster_snapshot_jobs_scanner.cpp
	modified:   be/src/exec/schema_scanner/schema_cluster_snapshots_scanner.cpp
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/system/information/ClusterSnapshotJobsTable.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/system/information/ClusterSnapshotsTable.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/Config.java
	modified:   fe/fe-core/src/main/java/com/starrocks/fs/HdfsUtil.java
	modified:   fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsService.java
	modified:   fe/fe-core/src/main/java/com/starrocks/journal/CheckpointWorker.java
	modified:   fe/fe-core/src/main/java/com/starrocks/lake/StarOSAgent.java
	new file:   fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshot.java
	new file:   fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshotCheckpointScheduler.java
	new file:   fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshotJob.java
	modified:   fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshotMgr.java
	new file:   fe/fe-core/src/main/java/com/starrocks/lake/snapshot/ClusterSnapshotUtils.java
	modified:   fe/fe-core/src/main/java/com/starrocks/leader/CheckpointController.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/ClusterSnapshotLog.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/service/FrontendServiceImpl.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/analyzer/ClusterSnapshotAnalyzer.java
	modified:   fe/fe-core/src/main/java/com/starrocks/storagevolume/StorageVolume.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/lake/ClusterSnapshotTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Jan 13, 2025

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot closed this Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant