diff --git a/go.mod b/go.mod index a7073ab91..0a88534ed 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.24.0 toolchain go1.25.3 +replace github.com/longhorn/longhorn-spdk-engine => github.com/yulken/longhorn-spdk-engine v0.0.0-e05509dbff19ffa9b4b48ceb3831654c1e44f899 + require ( github.com/google/uuid v1.6.0 github.com/longhorn/backupstore v0.0.0-20251009075049-1b6c3422a333 diff --git a/go.sum b/go.sum index 2e18c04c8..5d67d41f1 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,6 @@ github.com/longhorn/go-spdk-helper v0.0.4 h1:Or7+7LSHpT8wBEtvv22Q9E/Tl9ks46DFC3N github.com/longhorn/go-spdk-helper v0.0.4/go.mod h1:jXiQGipYcnbRZZ7mu5gCM4bbAtNeL9g+4UkDsjaTEzY= github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20250911042227-b892286beabd h1:2GDnGZ+CzRJR9iAdXvtEYBS60f8mZvmPOkCSr1Fk/DA= github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20250911042227-b892286beabd/go.mod h1:MPuXGH5nz8kOTO9w1Oydh7yJZvPJRQ1G13jRPf4T0o0= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437 h1:C8kq+8pfoCCFaSorUg1l8XphTmvaqmp/JpVYJhV4h10= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437/go.mod h1:4EzBtM9uzriBBx7ReyU1ckmMMFYaeZffXauszt08nq8= github.com/longhorn/sparse-tools v0.0.0-20250826041019-4aae87cb253a h1:uiECueW4EyOjfaw0GgKlbJjAjDBgQlsDiQjXDU262VY= github.com/longhorn/sparse-tools v0.0.0-20250826041019-4aae87cb253a/go.mod h1:dfbJqfI8+T9ZCp5zhTYcBi/64hPBNt5/vFF3gTlfMmc= github.com/longhorn/types v0.0.0-20251019113838-3455d9c2f5ca h1:PloBEw1MQHpbDzlg1IWMbGJOz0L2F7WzRXrAXwFEV6g= @@ -216,6 +214,8 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yulken/longhorn-spdk-engine v0.0.0-e05509dbff19ffa9b4b48ceb3831654c1e44f899 h1:WeTZ9YWA9aHG8avVR9LK5PCEbC0rK0vG+bkhmTQM4BY= +github.com/yulken/longhorn-spdk-engine v0.0.0-e05509dbff19ffa9b4b48ceb3831654c1e44f899/go.mod h1:GbQfjSCjLI1iAzTWlEEdVYKJkxo4Ya7p8tfBRiEUVxM= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= diff --git a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go index 1f4cce8d6..b0282e21b 100644 --- a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go +++ b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go @@ -2392,12 +2392,6 @@ func (e *Engine) snapshotOperationPreCheckWithoutLock(replicaClients map[string] if len(e.SnapshotMap[snapshotName].Children) > 1 { return "", fmt.Errorf("engine %s cannot delete snapshot %s since it contains multiple children %+v", e.Name, snapshotName, e.SnapshotMap[snapshotName].Children) } - // TODO: SPDK allows deleting the parent of the volume head. To make the behavior consistent between v1 and v2 engines, we manually disable if for now. - for childName := range e.SnapshotMap[snapshotName].Children { - if childName == types.VolumeHead { - return "", fmt.Errorf("engine %s cannot delete snapshot %s since it is the parent of volume head", e.Name, snapshotName) - } - } case SnapshotOperationRevert: if snapshotName == "" { return "", fmt.Errorf("empty snapshot name for engine %s snapshot deletion", e.Name) diff --git a/vendor/modules.txt b/vendor/modules.txt index 56fb4e0cb..3b2dc4413 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -293,7 +293,7 @@ github.com/longhorn/longhorn-engine/pkg/sync github.com/longhorn/longhorn-engine/pkg/types github.com/longhorn/longhorn-engine/pkg/util github.com/longhorn/longhorn-engine/pkg/util/disk -# github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437 +# github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437 => github.com/yulken/longhorn-spdk-engine v0.0.0-e05509dbff19ffa9b4b48ceb3831654c1e44f899 ## explicit; go 1.24.0 github.com/longhorn/longhorn-spdk-engine/pkg/api github.com/longhorn/longhorn-spdk-engine/pkg/client @@ -877,3 +877,4 @@ sigs.k8s.io/structured-merge-diff/v6/value # sigs.k8s.io/yaml v1.6.0 ## explicit; go 1.22 sigs.k8s.io/yaml +# github.com/longhorn/longhorn-spdk-engine => github.com/yulken/longhorn-spdk-engine v0.0.0-e05509dbff19ffa9b4b48ceb3831654c1e44f899