Skip to content

feat: refactor v2 linked clone feature#1404

Merged
derekbit merged 3 commits into
longhorn:masterfrom
shuo-wu:refactor/linked-clone
May 20, 2026
Merged

feat: refactor v2 linked clone feature#1404
derekbit merged 3 commits into
longhorn:masterfrom
shuo-wu:refactor/linked-clone

Conversation

@shuo-wu
Copy link
Copy Markdown
Contributor

@shuo-wu shuo-wu commented May 19, 2026

Which issue(s) this PR fixes:

Issue longhorn/longhorn#12552

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context

@mergify
Copy link
Copy Markdown

mergify Bot commented May 19, 2026

This pull request is now in conflict. Could you fix it @shuo-wu? 🙏

@shuo-wu shuo-wu force-pushed the refactor/linked-clone branch from ca2d360 to e0f7855 Compare May 19, 2026 03:35
derekbit
derekbit previously approved these changes May 19, 2026
Copy link
Copy Markdown
Member

@derekbit derekbit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
We can merge it after updating go.mod.

Longhorn 12552

Signed-off-by: Shuo Wu <shuo.wu@suse.com>
@derekbit
Copy link
Copy Markdown
Member

Hello @shuo-wu
DCO check failed. Is the PR still a draft or ready to review and merge?

shuo-wu added 2 commits May 19, 2026 17:54
Longhorn 12552

Signed-off-by: Shuo Wu <shuo.wu@suse.com>
And bump proxy API version to 7

Longhorn 12552

Signed-off-by: Shuo Wu <shuo.wu@suse.com>
@shuo-wu shuo-wu force-pushed the refactor/linked-clone branch from 5f64567 to 627f51a Compare May 20, 2026 00:54
@shuo-wu shuo-wu marked this pull request as ready for review May 20, 2026 00:55
@derekbit derekbit merged commit cca0104 into longhorn:master May 20, 2026
12 checks passed
@derekbit
Copy link
Copy Markdown
Member

@mergify backport v1.12.x

@mergify
Copy link
Copy Markdown

mergify Bot commented May 20, 2026

backport v1.12.x

✅ Backports have been created

Details

Cherry-pick of b7490f4 has failed:

On branch mergify/bp/v1.12.x/pr-1404
Your branch is up to date with 'origin/v1.12.x'.

You are currently cherry-picking commit b7490f43.
  (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:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/api/types.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/client/client_engine.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/replica.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_engine.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/types.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/imrpc/proxy.pb.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/modules.txt

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants