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 restoring from a cluster snapshot for shared-data mode (part 5, support downloading image) (backport #54651) #54714

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 6, 2025

What I'm doing:

Add config in cluster_snapshot.yaml, then the snapshot will be downloaded to local automatically.
Config example:

cluster_snapshot:
    storage_volume_name: my_s3_volume #defined in storage_volumes
    cluster_service_id: f7265e80-631c-44d3-a8ac-cf7cdc7adec811019
    cluster_snapshot_name: automated_cluster_snapshot_1704038400000

If there is no cluster_snapshot config in cluster_snapshot.yaml, it will not download a snapshot automatically, users could download a snapshot manually.

Fixes #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

…ode (part 5, support downloading image) (#54651)

Signed-off-by: xiangguangyxg <[email protected]>
(cherry picked from commit 9bf5750)

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

mergify bot commented Jan 6, 2025

Cherry-pick of 9bf5750 has failed:

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

You are currently cherry-picking commit 9bf575030.
  (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:   conf/cluster_snapshot.yaml
	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/lake/snapshot/ClusterSnapshotConfig.java
	modified:   fe/fe-core/src/main/java/com/starrocks/lake/snapshot/RestoreClusterSnapshotMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/leader/MetaHelper.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
	modified:   fe/fe-core/src/test/java/com/starrocks/lake/snapshot/ClusterSnapshotConfigTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/lake/snapshot/RestoreClusterSnapshotMgrTest.java
	modified:   fe/fe-core/src/test/resources/conf/cluster_snapshot.yaml
	new file:   fe/fe-core/src/test/resources/conf/cluster_snapshot2.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/fs/hdfs/HdfsFsManager.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

@mergify mergify bot added the conflicts label Jan 6, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) January 6, 2025 02:40
@mergify mergify bot closed this Jan 6, 2025
auto-merge was automatically disabled January 6, 2025 02:40

Pull request was closed

Copy link
Contributor Author

mergify bot commented Jan 6, 2025

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

@andyziye andyziye reopened this Jan 6, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) January 6, 2025 02:41
Signed-off-by: xiangguangyxg <[email protected]>
Copy link

sonarqubecloud bot commented Jan 6, 2025

@wanpengfei-git wanpengfei-git merged commit a4e2b54 into branch-3.4 Jan 6, 2025
28 of 29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.4/pr-54651 branch January 6, 2025 06:06
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.

4 participants