Skip to content

Commit

Permalink
fix: pass ctx to all Call funcs
Browse files Browse the repository at this point in the history 
Signed-off-by: Boris Glimcher <[email protected]>
  • Loading branch information
@glimchb
glimchb committed Oct 9, 2023
1 parent f69dc64 commit 9897611
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
24 changes: 12 additions & 12 deletions pkg/frontend/nvme_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_create_ctrlr", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand Down Expand Up @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_remove_ctrlr", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand Down Expand Up @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_update_ctrlr", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_ctrlr_list", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_get_info", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_get_ctrlr_stats", &params, &result)
if err != nil {
return nil, err
}
Expand Down
24 changes: 12 additions & 12 deletions pkg/frontend/nvme_namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_alloc_ns", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_attach_ns", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand Down Expand Up @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ctrlr_detach_ns", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_unalloc_ns", &params, &result)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_ns_list", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_ns_get_info", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_get_ns_stats", &params, &result)
if err != nil {
return nil, err
}
Expand Down
22 changes: 11 additions & 11 deletions pkg/frontend/nvme_subsystem.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_create_subsystem", &params, &result)
if err != nil {
return nil, err
}
Expand All @@ -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
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_delete_subsystem", &params, &result)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -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
Expand All @@ -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
}
Expand All @@ -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
Expand All @@ -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
}
Expand All @@ -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
Expand All @@ -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", &params, &result)
err := s.rpc.Call(ctx, "mrvl_nvm_subsys_get_info", &params, &result)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 9897611

Please sign in to comment.