diff --git a/go.mod b/go.mod index a77d1a855..e803662e8 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/longhorn/go-common-libs v0.0.0-20260502161928-1e84fa75a8f1 github.com/longhorn/go-spdk-helper v0.6.2-0.20260514102642-789b2a1cb467 github.com/longhorn/longhorn-engine v1.12.0-dev-20260503.0.20260514055128-ec3f7dbb512f - github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91 + github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515080523-0d855ad13a1d github.com/longhorn/types v0.0.0-20260514154143-1dfb06f48eeb github.com/sirupsen/logrus v1.9.4 github.com/urfave/cli v1.22.17 diff --git a/go.sum b/go.sum index a297ee334..c149d33da 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,8 @@ github.com/longhorn/go-spdk-helper v0.6.2-0.20260514102642-789b2a1cb467 h1:qwlSB github.com/longhorn/go-spdk-helper v0.6.2-0.20260514102642-789b2a1cb467/go.mod h1:ZxbMkGsbC2TpzuGLjn9yXXExolt8/F3dl/C8O9/Qa7s= github.com/longhorn/longhorn-engine v1.12.0-dev-20260503.0.20260514055128-ec3f7dbb512f h1:R76xekZfQKZTJrWs74QD4YLhXTiGEEUJr5aEjKGoh3k= github.com/longhorn/longhorn-engine v1.12.0-dev-20260503.0.20260514055128-ec3f7dbb512f/go.mod h1:WGxRiCkfdUBxNymnS8BaNBB9HXTQjJqUquptuUtM9+o= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91 h1:r+7KHgr5H33Mp6GEodYfGcj5ky7GT0LdVBDdcVyhwKQ= -github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91/go.mod h1:QozLt4bqxOnl69J8/o+zbMc40iQHzKfVO1v7zmfW31w= +github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515080523-0d855ad13a1d h1:0fqjZ8kP28+R1tCdpu+pYfhdhFW0DgdD/DRn4tz03Mw= +github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515080523-0d855ad13a1d/go.mod h1:QozLt4bqxOnl69J8/o+zbMc40iQHzKfVO1v7zmfW31w= github.com/longhorn/sparse-tools v0.0.0-20260423074222-280e61de741a h1:xb71oeVPI7XZymAAG8ts5deC8s40dnX5IgxTYAB/qnk= github.com/longhorn/sparse-tools v0.0.0-20260423074222-280e61de741a/go.mod h1:d8l9nyC8No3PIfYHwZunnBj88y5M4sDM+h6uZyTtaNk= github.com/longhorn/types v0.0.0-20260514154143-1dfb06f48eeb h1:kj/ag7xC8l9QewJ6tpZAWCYRgipYwIOkqPoqY52utW4= diff --git a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server.go b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server.go index 79002c4dd..80f93a60d 100644 --- a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server.go +++ b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server.go @@ -524,16 +524,16 @@ func (s *Server) broadcasting() { } } -func (s *Server) Subscribe(instanceType types.InstanceType) (<-chan interface{}, error) { +func (s *Server) Subscribe(ctx context.Context, instanceType types.InstanceType) (<-chan interface{}, error) { switch instanceType { case types.InstanceTypeEngine: - return s.broadcasters[types.InstanceTypeEngine].Subscribe(context.TODO(), s.engineBroadcastConnector) + return s.broadcasters[types.InstanceTypeEngine].Subscribe(ctx, s.engineBroadcastConnector) case types.InstanceTypeEngineFrontend: - return s.broadcasters[types.InstanceTypeEngineFrontend].Subscribe(context.TODO(), s.engineFrontendBroadcastConnector) + return s.broadcasters[types.InstanceTypeEngineFrontend].Subscribe(ctx, s.engineFrontendBroadcastConnector) case types.InstanceTypeReplica: - return s.broadcasters[types.InstanceTypeReplica].Subscribe(context.TODO(), s.replicaBroadcastConnector) + return s.broadcasters[types.InstanceTypeReplica].Subscribe(ctx, s.replicaBroadcastConnector) case types.InstanceTypeBackingImage: - return s.broadcasters[types.InstanceTypeBackingImage].Subscribe(context.TODO(), s.backingImageBroadcastConnector) + return s.broadcasters[types.InstanceTypeBackingImage].Subscribe(ctx, s.backingImageBroadcastConnector) } return nil, fmt.Errorf("invalid instance type %v for subscription", instanceType) } diff --git a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_backingimage.go b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_backingimage.go index 194db2abf..7968ac902 100644 --- a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_backingimage.go +++ b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_backingimage.go @@ -164,7 +164,7 @@ func (s *Server) BackingImageList(ctx context.Context, req *emptypb.Empty) (ret // BackingImageWatch will watch the backing image update. func (s *Server) BackingImageWatch(req *emptypb.Empty, srv spdkrpc.SPDKService_BackingImageWatchServer) error { - responseCh, err := s.Subscribe(types.InstanceTypeBackingImage) + responseCh, err := s.Subscribe(srv.Context(), types.InstanceTypeBackingImage) if err != nil { return err } diff --git a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_engine.go b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_engine.go index 89f675ffc..81459ae0d 100644 --- a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_engine.go +++ b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_engine.go @@ -261,7 +261,7 @@ func (s *Server) EngineList(ctx context.Context, req *emptypb.Empty) (*spdkrpc.E // EngineWatch returns a stream of engine updates func (s *Server) EngineWatch(req *emptypb.Empty, srv spdkrpc.SPDKService_EngineWatchServer) error { - responseCh, err := s.Subscribe(types.InstanceTypeEngine) + responseCh, err := s.Subscribe(srv.Context(), types.InstanceTypeEngine) if err != nil { return err } diff --git a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_enginefrontend.go b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_enginefrontend.go index fc1442f51..40d584291 100644 --- a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_enginefrontend.go +++ b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_enginefrontend.go @@ -384,7 +384,7 @@ func (s *Server) EngineFrontendList(ctx context.Context, req *emptypb.Empty) (*s // EngineFrontendWatch watches engine frontends. func (s *Server) EngineFrontendWatch(req *emptypb.Empty, srv spdkrpc.SPDKService_EngineFrontendWatchServer) error { - responseCh, err := s.Subscribe(types.InstanceTypeEngineFrontend) + responseCh, err := s.Subscribe(srv.Context(), types.InstanceTypeEngineFrontend) if err != nil { return err } diff --git a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_replica.go b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_replica.go index 940eee3d9..22a1d6c96 100644 --- a/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_replica.go +++ b/vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_replica.go @@ -136,7 +136,7 @@ func (s *Server) ReplicaList(ctx context.Context, req *emptypb.Empty) (*spdkrpc. // ReplicaWatch returns a stream of replica updates func (s *Server) ReplicaWatch(req *emptypb.Empty, srv spdkrpc.SPDKService_ReplicaWatchServer) error { - responseCh, err := s.Subscribe(types.InstanceTypeReplica) + responseCh, err := s.Subscribe(srv.Context(), types.InstanceTypeReplica) if err != nil { return err } diff --git a/vendor/modules.txt b/vendor/modules.txt index b3206bf3f..93a66a1a3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -383,7 +383,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-20260515051212-7e0ddb934b91 +# github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515080523-0d855ad13a1d ## explicit; go 1.26.0 github.com/longhorn/longhorn-spdk-engine/pkg/api github.com/longhorn/longhorn-spdk-engine/pkg/client