From 70729172cc7888ae30f7d34b274a8252602921f3 Mon Sep 17 00:00:00 2001 From: Boris Glimcher Date: Tue, 10 Oct 2023 00:18:44 +0300 Subject: [PATCH] fix: pass ctx to all Call funcs Signed-off-by: Boris Glimcher --- go.mod | 12 ++++++------ go.sum | 12 ++++++++++++ pkg/frontend/nvme_controller.go | 24 ++++++++++++------------ pkg/frontend/nvme_namespace.go | 24 ++++++++++++------------ pkg/frontend/nvme_subsystem.go | 22 +++++++++++----------- 5 files changed, 53 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 2ff4c534..7a60a30b 100644 --- a/go.mod +++ b/go.mod @@ -8,10 +8,10 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/onsi/ginkgo/v2 v2.12.1 - github.com/opiproject/gospdk v0.0.0-20231009130851-ff9bd6faf71a - github.com/opiproject/opi-api v0.0.0-20231005114927-ec55946e5197 + github.com/opiproject/gospdk v0.0.0-20231010002529-a2e5546ab856 + github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86 github.com/opiproject/opi-smbios-bridge v0.1.3-0.20231002193517-9e34badb6265 - github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007135056-df9fa5d7b614 + github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231010125224-24f59929632e github.com/opiproject/opi-strongswan-bridge v0.1.1 github.com/philippgille/gokv v0.6.0 github.com/philippgille/gokv/gomap v0.6.0 @@ -215,9 +215,9 @@ require ( golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect + google.golang.org/genproto v0.0.0-20231009173412-8bfb1ae86b6c // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231009173412-8bfb1ae86b6c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index b01bf208..198e1285 100644 --- a/go.sum +++ b/go.sum @@ -442,12 +442,16 @@ github.com/opiproject/gospdk v0.0.0-20231003165248-8edbef6eb841 h1:xfR6qBHRRsRun github.com/opiproject/gospdk v0.0.0-20231003165248-8edbef6eb841/go.mod h1:mRMIpGIwz5uuUUaDhh6ceIYq20qR5OVtxE0/x5fprEA= github.com/opiproject/gospdk v0.0.0-20231009130851-ff9bd6faf71a h1:8j6GXu13bFM3uEo30n1H3h1MmgncFhjQkqw0TWEEy00= github.com/opiproject/gospdk v0.0.0-20231009130851-ff9bd6faf71a/go.mod h1:mRMIpGIwz5uuUUaDhh6ceIYq20qR5OVtxE0/x5fprEA= +github.com/opiproject/gospdk v0.0.0-20231010002529-a2e5546ab856 h1:6g5F0gWzBUblradIH0kLyOc0teyYq9Sdi07U1nAbs+A= +github.com/opiproject/gospdk v0.0.0-20231010002529-a2e5546ab856/go.mod h1:mRMIpGIwz5uuUUaDhh6ceIYq20qR5OVtxE0/x5fprEA= github.com/opiproject/opi-api v0.0.0-20231002080217-fc749d07fdda h1:w/HTrqmBrXabdcc71ACkRQqavKDFvfPp0MqiGWKTGjw= github.com/opiproject/opi-api v0.0.0-20231002080217-fc749d07fdda/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= github.com/opiproject/opi-api v0.0.0-20231004104309-217649f4535f h1:TXLfuUmFwB7Zk8YKIzEfT/LQ2i5d+BW/BzjQgaBBOWM= github.com/opiproject/opi-api v0.0.0-20231004104309-217649f4535f/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= github.com/opiproject/opi-api v0.0.0-20231005114927-ec55946e5197 h1:3wsLOfvfaVcnhA3ehz4HkAoejop/rlLy0msWM2pA0zw= github.com/opiproject/opi-api v0.0.0-20231005114927-ec55946e5197/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= +github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86 h1:lHZuWCy8La/nSZr2IAnLbrNV6JHCmWS1IMlTM73mPVM= +github.com/opiproject/opi-api v0.0.0-20231009064235-b166668c8a86/go.mod h1:92pv4ulvvPMuxCJ9ND3aYbmBfEMLx0VCjpkiR7ZTqPY= github.com/opiproject/opi-smbios-bridge v0.1.3-0.20230930033102-4953908f3ea6 h1:0TCR2UmJcQTCCH1uK0LdZ6LcBycO3uUAnLwfBqs6rIM= github.com/opiproject/opi-smbios-bridge v0.1.3-0.20230930033102-4953908f3ea6/go.mod h1:qWMKMtmpgqXDoV4T+VYY6w9vwreU2y14eY9y5pRpsW8= github.com/opiproject/opi-smbios-bridge v0.1.3-0.20231002193517-9e34badb6265 h1:7yPIQIPhRB09+ni0ypQAKrzhvfDfphk+dXRVl9Pyuvk= @@ -460,6 +464,8 @@ github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007094833-d69cbf81897a h1:en github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007094833-d69cbf81897a/go.mod h1:INyfSuY7woo5F/d0YjN3EerzYvBhNVLXylIANfCdxd0= github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007135056-df9fa5d7b614 h1:OW5/l/D74kyOtyeqecLm7yLWb/SyPpsINH5zAvUluJ4= github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231007135056-df9fa5d7b614/go.mod h1:KRkBGPdFmmY+JeZrHj5Aa/LnSN+MUuW3nVkb7Bd7Fu8= +github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231010125224-24f59929632e h1:NJEwCp0l2SR2cIhaCQw3A+NO9Nu8ygChRzJywhmynzc= +github.com/opiproject/opi-spdk-bridge v0.1.2-0.20231010125224-24f59929632e/go.mod h1:kyhCIlm5xZxRzgOrOhmYyPLniSVg++fQ917VoTnSs5c= github.com/opiproject/opi-strongswan-bridge v0.1.1 h1:Mz/8AtA0DD8O/H9jCsDw7wuVoWNiqgXICLsD10XWJ+g= github.com/opiproject/opi-strongswan-bridge v0.1.1/go.mod h1:ek3r3zLa9nOfb2a7ybdMJvb5BSGU9I17Xo38UMXfE+k= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= @@ -1038,14 +1044,20 @@ google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTb google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0= google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= +google.golang.org/genproto v0.0.0-20231009173412-8bfb1ae86b6c h1:ml3TAUoIIzQUtX88s/icpXCFW9lV5VwsuIuS1htNjKY= +google.golang.org/genproto v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:MugzuwC+GYOxyF0XUGQvsT97bOgWCV7MM1XMc5FZv8E= google.golang.org/genproto/googleapis/api v0.0.0-20230911183012-2d3300fd4832 h1:4E7rZzBdR5LmiZx6n47Dg4AjH8JLhMQWywsYqvXNLcs= google.golang.org/genproto/googleapis/api v0.0.0-20230911183012-2d3300fd4832/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU= google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= +google.golang.org/genproto/googleapis/api v0.0.0-20231009173412-8bfb1ae86b6c h1:0RtEmmHjemvUXloH7+RuBSIw7n+GEHMOMY1CkGYnWq4= +google.golang.org/genproto/googleapis/api v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:Wth13BrWMRN/G+guBLupKa6fslcWZv14R0ZKDRkNfY8= google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0= google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c h1:jHkCUWkseRf+W+edG5hMzr/Uh1xkDREY4caybAq4dpY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/pkg/frontend/nvme_controller.go b/pkg/frontend/nvme_controller.go index 0877f396..b9aaf229 100644 --- a/pkg/frontend/nvme_controller.go +++ b/pkg/frontend/nvme_controller.go @@ -36,7 +36,7 @@ func sortNvmeControllers(controllers []*pb.NvmeController) { } // CreateNvmeController creates an Nvme controller -func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeControllerRequest) (*pb.NvmeController, error) { +func (s *Server) CreateNvmeController(ctx context.Context, in *pb.CreateNvmeControllerRequest) (*pb.NvmeController, error) { // check input correctness if err := s.validateCreateNvmeControllerRequest(in); err != nil { return nil, err @@ -78,7 +78,7 @@ func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeContro Mqes: int(in.GetNvmeController().GetSpec().GetSqes()), } var result models.MrvlNvmSubsysCreateCtrlrResult - err := s.rpc.Call("mrvl_nvm_subsys_create_ctrlr", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_create_ctrlr", ¶ms, &result) if err != nil { return nil, err } @@ -95,7 +95,7 @@ func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeContro } // DeleteNvmeController deletes an Nvme controller -func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeControllerRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteNvmeController(ctx context.Context, in *pb.DeleteNvmeControllerRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteNvmeControllerRequest(in); err != nil { return nil, err @@ -123,7 +123,7 @@ func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeContro Force: 1, } var result models.MrvlNvmSubsysRemoveCtrlrResult - err := s.rpc.Call("mrvl_nvm_subsys_remove_ctrlr", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_remove_ctrlr", ¶ms, &result) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (s *Server) DeleteNvmeController(_ context.Context, in *pb.DeleteNvmeContro } // UpdateNvmeController updates an Nvme controller -func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeControllerRequest) (*pb.NvmeController, error) { +func (s *Server) UpdateNvmeController(ctx context.Context, in *pb.UpdateNvmeControllerRequest) (*pb.NvmeController, error) { // check input correctness if err := s.validateUpdateNvmeControllerRequest(in); err != nil { return nil, err @@ -180,7 +180,7 @@ func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeContro Mqes: int(in.GetNvmeController().GetSpec().GetSqes()), } var result models.MrvlNvmSubsysCreateCtrlrResult - err := s.rpc.Call("mrvl_nvm_subsys_update_ctrlr", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_update_ctrlr", ¶ms, &result) if err != nil { return nil, err } @@ -197,7 +197,7 @@ func (s *Server) UpdateNvmeController(_ context.Context, in *pb.UpdateNvmeContro } // ListNvmeControllers lists Nvme controllers -func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControllersRequest) (*pb.ListNvmeControllersResponse, error) { +func (s *Server) ListNvmeControllers(ctx context.Context, in *pb.ListNvmeControllersRequest) (*pb.ListNvmeControllersResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -216,7 +216,7 @@ func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControlle Subnqn: subsys.Spec.Nqn, } var result models.MrvlNvmSubsysGetCtrlrListResult - err := s.rpc.Call("mrvl_nvm_subsys_get_ctrlr_list", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_ctrlr_list", ¶ms, &result) if err != nil { return nil, err } @@ -242,7 +242,7 @@ func (s *Server) ListNvmeControllers(_ context.Context, in *pb.ListNvmeControlle } // GetNvmeController gets an Nvme controller -func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRequest) (*pb.NvmeController, error) { +func (s *Server) GetNvmeController(ctx context.Context, in *pb.GetNvmeControllerRequest) (*pb.NvmeController, error) { // check input correctness if err := s.validateGetNvmeControllerRequest(in); err != nil { return nil, err @@ -266,7 +266,7 @@ func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRe CtrlrID: int(*controller.Spec.NvmeControllerId), } var result models.MrvlNvmGetCtrlrInfoResult - err := s.rpc.Call("mrvl_nvm_ctrlr_get_info", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_get_info", ¶ms, &result) if err != nil { return nil, err } @@ -280,7 +280,7 @@ func (s *Server) GetNvmeController(_ context.Context, in *pb.GetNvmeControllerRe } // StatsNvmeController gets an Nvme controller stats -func (s *Server) StatsNvmeController(_ context.Context, in *pb.StatsNvmeControllerRequest) (*pb.StatsNvmeControllerResponse, error) { +func (s *Server) StatsNvmeController(ctx context.Context, in *pb.StatsNvmeControllerRequest) (*pb.StatsNvmeControllerResponse, error) { // check input correctness if err := s.validateStatsNvmeControllerRequest(in); err != nil { return nil, err @@ -304,7 +304,7 @@ func (s *Server) StatsNvmeController(_ context.Context, in *pb.StatsNvmeControll CtrlrID: int(*controller.Spec.NvmeControllerId), } var result models.MrvlNvmGetCtrlrStatsResult - err := s.rpc.Call("mrvl_nvm_get_ctrlr_stats", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_get_ctrlr_stats", ¶ms, &result) if err != nil { return nil, err } diff --git a/pkg/frontend/nvme_namespace.go b/pkg/frontend/nvme_namespace.go index 27ec95be..a5e5063a 100644 --- a/pkg/frontend/nvme_namespace.go +++ b/pkg/frontend/nvme_namespace.go @@ -34,7 +34,7 @@ func sortNvmeNamespaces(namespaces []*pb.NvmeNamespace) { } // CreateNvmeNamespace creates an Nvme namespace -func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { +func (s *Server) CreateNvmeNamespace(ctx context.Context, in *pb.CreateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { // check input correctness if err := s.validateCreateNvmeNamespaceRequest(in); err != nil { return nil, err @@ -70,7 +70,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa Bdev: in.NvmeNamespace.Spec.VolumeNameRef, } var result models.MrvlNvmSubsysAllocNsResult - err := s.rpc.Call("mrvl_nvm_subsys_alloc_ns", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_alloc_ns", ¶ms, &result) if err != nil { return nil, err } @@ -90,7 +90,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa NsInstanceID: int(in.NvmeNamespace.Spec.HostNsid), } var result models.MrvlNvmCtrlrAttachNsResult - err := s.rpc.Call("mrvl_nvm_ctrlr_attach_ns", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_attach_ns", ¶ms, &result) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa } // DeleteNvmeNamespace deletes an Nvme namespace -func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespaceRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteNvmeNamespace(ctx context.Context, in *pb.DeleteNvmeNamespaceRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteNvmeNamespaceRequest(in); err != nil { return nil, err @@ -139,7 +139,7 @@ func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespa NsInstanceID: int(namespace.Spec.HostNsid), } var result models.MrvlNvmCtrlrDetachNsResult - err := s.rpc.Call("mrvl_nvm_ctrlr_detach_ns", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_detach_ns", ¶ms, &result) if err != nil { return nil, err } @@ -154,7 +154,7 @@ func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespa NsInstanceID: int(namespace.Spec.HostNsid), } var result models.MrvlNvmSubsysUnallocNsResult - err := s.rpc.Call("mrvl_nvm_subsys_unalloc_ns", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_unalloc_ns", ¶ms, &result) if err != nil { return nil, err } @@ -192,7 +192,7 @@ func (s *Server) UpdateNvmeNamespace(_ context.Context, in *pb.UpdateNvmeNamespa } // ListNvmeNamespaces lists Nvme namespaces -func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespacesRequest) (*pb.ListNvmeNamespacesResponse, error) { +func (s *Server) ListNvmeNamespaces(ctx context.Context, in *pb.ListNvmeNamespacesRequest) (*pb.ListNvmeNamespacesResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -211,7 +211,7 @@ func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespaces Subnqn: subsys.Spec.Nqn, } var result models.MrvlNvmSubsysGetNsListResult - err := s.rpc.Call("mrvl_nvm_subsys_get_ns_list", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_ns_list", ¶ms, &result) if err != nil { return nil, err } @@ -237,7 +237,7 @@ func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespaces } // GetNvmeNamespace gets an Nvme namespace -func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { +func (s *Server) GetNvmeNamespace(ctx context.Context, in *pb.GetNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { // check input correctness if err := s.validateGetNvmeNamespaceRequest(in); err != nil { return nil, err @@ -263,7 +263,7 @@ func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequ NsInstanceID: int(namespace.Spec.HostNsid), } var result models.MrvlNvmGetNsInfoResult - err := s.rpc.Call("mrvl_nvm_ns_get_info", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_ns_get_info", ¶ms, &result) if err != nil { return nil, err } @@ -276,7 +276,7 @@ func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequ } // StatsNvmeNamespace gets an Nvme namespace stats -func (s *Server) StatsNvmeNamespace(_ context.Context, in *pb.StatsNvmeNamespaceRequest) (*pb.StatsNvmeNamespaceResponse, error) { +func (s *Server) StatsNvmeNamespace(ctx context.Context, in *pb.StatsNvmeNamespaceRequest) (*pb.StatsNvmeNamespaceResponse, error) { // check input correctness if err := s.validateStatsNvmeNamespaceRequest(in); err != nil { return nil, err @@ -301,7 +301,7 @@ func (s *Server) StatsNvmeNamespace(_ context.Context, in *pb.StatsNvmeNamespace NsInstanceID: int(namespace.Spec.HostNsid), } var result models.MrvlNvmGetNsStatsResult - err := s.rpc.Call("mrvl_nvm_get_ns_stats", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_get_ns_stats", ¶ms, &result) if err != nil { return nil, err } diff --git a/pkg/frontend/nvme_subsystem.go b/pkg/frontend/nvme_subsystem.go index 959dc426..a42846f9 100644 --- a/pkg/frontend/nvme_subsystem.go +++ b/pkg/frontend/nvme_subsystem.go @@ -34,7 +34,7 @@ func sortNvmeSubsystems(subsystems []*pb.NvmeSubsystem) { } // CreateNvmeSubsystem creates an Nvme Subsystem -func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { +func (s *Server) CreateNvmeSubsystem(ctx context.Context, in *pb.CreateNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { // check input correctness if err := s.validateCreateNvmeSubsystemRequest(in); err != nil { return nil, err @@ -71,7 +71,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst MaxCtrlrID: 256, } var result models.MrvlNvmCreateSubsystemResult - err := s.rpc.Call("mrvl_nvm_create_subsystem", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_create_subsystem", ¶ms, &result) if err != nil { return nil, err } @@ -81,7 +81,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst return nil, status.Errorf(codes.InvalidArgument, msg) } var ver spdk.GetVersionResult - err = s.rpc.Call("spdk_get_version", nil, &ver) + err = s.rpc.Call(ctx, "spdk_get_version", nil, &ver) if err != nil { return nil, err } @@ -93,7 +93,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst } // DeleteNvmeSubsystem deletes an Nvme Subsystem -func (s *Server) DeleteNvmeSubsystem(_ context.Context, in *pb.DeleteNvmeSubsystemRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteNvmeSubsystem(ctx context.Context, in *pb.DeleteNvmeSubsystemRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteNvmeSubsystemRequest(in); err != nil { return nil, err @@ -111,7 +111,7 @@ func (s *Server) DeleteNvmeSubsystem(_ context.Context, in *pb.DeleteNvmeSubsyst Subnqn: subsys.Spec.Nqn, } var result models.MrvlNvmDeleteSubsystemResult - err := s.rpc.Call("mrvl_nvm_delete_subsystem", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_delete_subsystem", ¶ms, &result) if err != nil { return nil, err } @@ -149,7 +149,7 @@ func (s *Server) UpdateNvmeSubsystem(_ context.Context, in *pb.UpdateNvmeSubsyst } // ListNvmeSubsystems lists Nvme Subsystems -func (s *Server) ListNvmeSubsystems(_ context.Context, in *pb.ListNvmeSubsystemsRequest) (*pb.ListNvmeSubsystemsResponse, error) { +func (s *Server) ListNvmeSubsystems(ctx context.Context, in *pb.ListNvmeSubsystemsRequest) (*pb.ListNvmeSubsystemsResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -160,7 +160,7 @@ func (s *Server) ListNvmeSubsystems(_ context.Context, in *pb.ListNvmeSubsystems return nil, perr } var result models.MrvlNvmGetSubsysListResult - err := s.rpc.Call("mrvl_nvm_get_subsys_list", nil, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_get_subsys_list", nil, &result) if err != nil { return nil, err } @@ -186,7 +186,7 @@ func (s *Server) ListNvmeSubsystems(_ context.Context, in *pb.ListNvmeSubsystems } // GetNvmeSubsystem gets Nvme Subsystems -func (s *Server) GetNvmeSubsystem(_ context.Context, in *pb.GetNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { +func (s *Server) GetNvmeSubsystem(ctx context.Context, in *pb.GetNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { // check input correctness if err := s.validateGetNvmeSubsystemRequest(in); err != nil { return nil, err @@ -199,7 +199,7 @@ func (s *Server) GetNvmeSubsystem(_ context.Context, in *pb.GetNvmeSubsystemRequ } // TODO: replace with MRVL code : mrvl_nvm_subsys_get_info ? var result models.MrvlNvmGetSubsysListResult - err := s.rpc.Call("mrvl_nvm_get_subsys_list", nil, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_get_subsys_list", nil, &result) if err != nil { return nil, err } @@ -219,7 +219,7 @@ func (s *Server) GetNvmeSubsystem(_ context.Context, in *pb.GetNvmeSubsystemRequ } // StatsNvmeSubsystem gets Nvme Subsystem stats -func (s *Server) StatsNvmeSubsystem(_ context.Context, in *pb.StatsNvmeSubsystemRequest) (*pb.StatsNvmeSubsystemResponse, error) { +func (s *Server) StatsNvmeSubsystem(ctx context.Context, in *pb.StatsNvmeSubsystemRequest) (*pb.StatsNvmeSubsystemResponse, error) { // check input correctness if err := s.validateStatsNvmeSubsystemRequest(in); err != nil { return nil, err @@ -234,7 +234,7 @@ func (s *Server) StatsNvmeSubsystem(_ context.Context, in *pb.StatsNvmeSubsystem Subnqn: subsys.Spec.Nqn, } var result models.MrvlNvmGetSubsysInfoResult - err := s.rpc.Call("mrvl_nvm_subsys_get_info", ¶ms, &result) + err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_info", ¶ms, &result) if err != nil { return nil, err }