Skip to content

feat: support snapshot max count for v2 (backport #1391)#1394

Merged
derekbit merged 2 commits into
v1.12.xfrom
mergify/bp/v1.12.x/pr-1391
May 15, 2026
Merged

feat: support snapshot max count for v2 (backport #1391)#1394
derekbit merged 2 commits into
v1.12.xfrom
mergify/bp/v1.12.x/pr-1391

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented May 15, 2026

Which issue(s) this PR fixes:

longhorn/longhorn#12921

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context


This is an automatic backport of pull request #1391 done by [Mergify](https://mergify.com).

Longhorn: 12921

Signed-off-by: David Cheng <david.cheng@suse.com>
(cherry picked from commit 1ecf693)

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
@mergify mergify Bot added the conflicts label May 15, 2026
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented May 15, 2026

Cherry-pick of 1ecf693 has failed:

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

You are currently cherry-picking commit 1ecf693e.
  (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:   pkg/client/instance.go
	modified:   pkg/instance/instance.go
	modified:   pkg/proxy/volume.go
	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/server_engine.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/imrpc/instance.pb.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk_grpc.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

@derekbit
Copy link
Copy Markdown
Member

Hello @davidcheng0922 Could you update the go.mod to use v1.12.x longhorn-spdk-engine? Thank you.

@davidcheng0922
Copy link
Copy Markdown
Contributor

Hello @davidcheng0922 Could you update the go.mod to use v1.12.x longhorn-spdk-engine? Thank you.

Done, thank you

Comment thread go.mod Outdated
github.com/longhorn/longhorn-engine v1.12.0-rc1.0.20260514055507-33e0c9c94743
github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260514112050-c9306c85100e
github.com/longhorn/types v0.0.0-20260513135851-499d5d1f4e79
github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

https://github.com/longhorn/longhorn-spdk-engine/commits/v1.12.x/

The commit id should be a07df50fb05a43d68790e95954fd08cf3f8bdd2b

@davidcheng0922 davidcheng0922 force-pushed the mergify/bp/v1.12.x/pr-1391 branch from 6fca282 to 800d45a Compare May 15, 2026 07:07
Longhorn: 12921

Signed-off-by: David Cheng <david.cheng@suse.com>
@davidcheng0922 davidcheng0922 force-pushed the mergify/bp/v1.12.x/pr-1391 branch from 800d45a to 840e76e Compare May 15, 2026 07:09
@derekbit derekbit merged commit a4e4e7d into v1.12.x May 15, 2026
12 checks passed
@derekbit derekbit deleted the mergify/bp/v1.12.x/pr-1391 branch May 15, 2026 07:16
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.

2 participants