diff --git a/pkg/backend/aio.go b/pkg/backend/aio.go index 4093e6a9..9ff4e429 100644 --- a/pkg/backend/aio.go +++ b/pkg/backend/aio.go @@ -32,7 +32,7 @@ func sortAioVolumes(volumes []*pb.AioVolume) { } // CreateAioVolume creates an Aio volume -func (s *Server) CreateAioVolume(_ context.Context, in *pb.CreateAioVolumeRequest) (*pb.AioVolume, error) { +func (s *Server) CreateAioVolume(ctx context.Context, in *pb.CreateAioVolumeRequest) (*pb.AioVolume, error) { // check input correctness if err := s.validateCreateAioVolumeRequest(in); err != nil { return nil, err @@ -57,7 +57,7 @@ func (s *Server) CreateAioVolume(_ context.Context, in *pb.CreateAioVolumeReques Filename: in.AioVolume.Filename, } var result spdk.BdevAioCreateResult - err := s.rpc.Call("bdev_aio_create", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_aio_create", ¶ms, &result) if err != nil { return nil, err } @@ -72,7 +72,7 @@ func (s *Server) CreateAioVolume(_ context.Context, in *pb.CreateAioVolumeReques } // DeleteAioVolume deletes an Aio volume -func (s *Server) DeleteAioVolume(_ context.Context, in *pb.DeleteAioVolumeRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteAioVolume(ctx context.Context, in *pb.DeleteAioVolumeRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteAioVolumeRequest(in); err != nil { return nil, err @@ -91,7 +91,7 @@ func (s *Server) DeleteAioVolume(_ context.Context, in *pb.DeleteAioVolumeReques Name: resourceID, } var result spdk.BdevAioDeleteResult - err := s.rpc.Call("bdev_aio_delete", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_aio_delete", ¶ms, &result) if err != nil { return nil, err } @@ -105,7 +105,7 @@ func (s *Server) DeleteAioVolume(_ context.Context, in *pb.DeleteAioVolumeReques } // UpdateAioVolume updates an Aio volume -func (s *Server) UpdateAioVolume(_ context.Context, in *pb.UpdateAioVolumeRequest) (*pb.AioVolume, error) { +func (s *Server) UpdateAioVolume(ctx context.Context, in *pb.UpdateAioVolumeRequest) (*pb.AioVolume, error) { // check input correctness if err := s.validateUpdateAioVolumeRequest(in); err != nil { return nil, err @@ -121,7 +121,7 @@ func (s *Server) UpdateAioVolume(_ context.Context, in *pb.UpdateAioVolumeReques Filename: in.AioVolume.Filename, } var result spdk.BdevAioCreateResult - err := s.rpc.Call("bdev_aio_create", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_aio_create", ¶ms, &result) if err != nil { return nil, err } @@ -146,7 +146,7 @@ func (s *Server) UpdateAioVolume(_ context.Context, in *pb.UpdateAioVolumeReques Name: resourceID, } var result1 spdk.BdevAioDeleteResult - err1 := s.rpc.Call("bdev_aio_delete", ¶ms1, &result1) + err1 := s.rpc.Call(ctx, "bdev_aio_delete", ¶ms1, &result1) if err1 != nil { return nil, err1 } @@ -161,7 +161,7 @@ func (s *Server) UpdateAioVolume(_ context.Context, in *pb.UpdateAioVolumeReques Filename: in.AioVolume.Filename, } var result2 spdk.BdevAioCreateResult - err2 := s.rpc.Call("bdev_aio_create", ¶ms2, &result2) + err2 := s.rpc.Call(ctx, "bdev_aio_create", ¶ms2, &result2) if err2 != nil { return nil, err2 } @@ -176,7 +176,7 @@ func (s *Server) UpdateAioVolume(_ context.Context, in *pb.UpdateAioVolumeReques } // ListAioVolumes lists Aio volumes -func (s *Server) ListAioVolumes(_ context.Context, in *pb.ListAioVolumesRequest) (*pb.ListAioVolumesResponse, error) { +func (s *Server) ListAioVolumes(ctx context.Context, in *pb.ListAioVolumesRequest) (*pb.ListAioVolumesResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -187,7 +187,7 @@ func (s *Server) ListAioVolumes(_ context.Context, in *pb.ListAioVolumesRequest) return nil, perr } var result []spdk.BdevGetBdevsResult - err := s.rpc.Call("bdev_get_bdevs", nil, &result) + err := s.rpc.Call(ctx, "bdev_get_bdevs", nil, &result) if err != nil { return nil, err } @@ -209,7 +209,7 @@ func (s *Server) ListAioVolumes(_ context.Context, in *pb.ListAioVolumesRequest) } // GetAioVolume gets an Aio volume -func (s *Server) GetAioVolume(_ context.Context, in *pb.GetAioVolumeRequest) (*pb.AioVolume, error) { +func (s *Server) GetAioVolume(ctx context.Context, in *pb.GetAioVolumeRequest) (*pb.AioVolume, error) { // check input correctness if err := s.validateGetAioVolumeRequest(in); err != nil { return nil, err @@ -225,7 +225,7 @@ func (s *Server) GetAioVolume(_ context.Context, in *pb.GetAioVolumeRequest) (*p Name: resourceID, } var result []spdk.BdevGetBdevsResult - err := s.rpc.Call("bdev_get_bdevs", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_bdevs", ¶ms, &result) if err != nil { return nil, err } @@ -238,7 +238,7 @@ func (s *Server) GetAioVolume(_ context.Context, in *pb.GetAioVolumeRequest) (*p } // StatsAioVolume gets an Aio volume stats -func (s *Server) StatsAioVolume(_ context.Context, in *pb.StatsAioVolumeRequest) (*pb.StatsAioVolumeResponse, error) { +func (s *Server) StatsAioVolume(ctx context.Context, in *pb.StatsAioVolumeRequest) (*pb.StatsAioVolumeResponse, error) { // check input correctness if err := s.validateStatsAioVolumeRequest(in); err != nil { return nil, err @@ -255,7 +255,7 @@ func (s *Server) StatsAioVolume(_ context.Context, in *pb.StatsAioVolumeRequest) } // See https://mholt.github.io/json-to-go/ var result spdk.BdevGetIostatResult - err := s.rpc.Call("bdev_get_iostat", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_iostat", ¶ms, &result) if err != nil { return nil, err } diff --git a/pkg/backend/null.go b/pkg/backend/null.go index 35f35f7a..daa53397 100644 --- a/pkg/backend/null.go +++ b/pkg/backend/null.go @@ -33,7 +33,7 @@ func sortNullVolumes(volumes []*pb.NullVolume) { } // CreateNullVolume creates a Null volume instance -func (s *Server) CreateNullVolume(_ context.Context, in *pb.CreateNullVolumeRequest) (*pb.NullVolume, error) { +func (s *Server) CreateNullVolume(ctx context.Context, in *pb.CreateNullVolumeRequest) (*pb.NullVolume, error) { // check input correctness if err := s.validateCreateNullVolumeRequest(in); err != nil { return nil, err @@ -58,7 +58,7 @@ func (s *Server) CreateNullVolume(_ context.Context, in *pb.CreateNullVolumeRequ NumBlocks: 64, } var result spdk.BdevNullCreateResult - err := s.rpc.Call("bdev_null_create", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_null_create", ¶ms, &result) if err != nil { return nil, err } @@ -73,7 +73,7 @@ func (s *Server) CreateNullVolume(_ context.Context, in *pb.CreateNullVolumeRequ } // DeleteNullVolume deletes a Null volume instance -func (s *Server) DeleteNullVolume(_ context.Context, in *pb.DeleteNullVolumeRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteNullVolume(ctx context.Context, in *pb.DeleteNullVolumeRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteNullVolumeRequest(in); err != nil { return nil, err @@ -92,7 +92,7 @@ func (s *Server) DeleteNullVolume(_ context.Context, in *pb.DeleteNullVolumeRequ Name: resourceID, } var result spdk.BdevNullDeleteResult - err := s.rpc.Call("bdev_null_delete", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_null_delete", ¶ms, &result) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (s *Server) DeleteNullVolume(_ context.Context, in *pb.DeleteNullVolumeRequ } // UpdateNullVolume updates a Null volume instance -func (s *Server) UpdateNullVolume(_ context.Context, in *pb.UpdateNullVolumeRequest) (*pb.NullVolume, error) { +func (s *Server) UpdateNullVolume(ctx context.Context, in *pb.UpdateNullVolumeRequest) (*pb.NullVolume, error) { // check input correctness if err := s.validateUpdateNullVolumeRequest(in); err != nil { return nil, err @@ -122,7 +122,7 @@ func (s *Server) UpdateNullVolume(_ context.Context, in *pb.UpdateNullVolumeRequ NumBlocks: 64, } var result spdk.BdevNullCreateResult - err := s.rpc.Call("bdev_null_create", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_null_create", ¶ms, &result) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func (s *Server) UpdateNullVolume(_ context.Context, in *pb.UpdateNullVolumeRequ Name: resourceID, } var result1 spdk.BdevNullDeleteResult - err1 := s.rpc.Call("bdev_null_delete", ¶ms1, &result1) + err1 := s.rpc.Call(ctx, "bdev_null_delete", ¶ms1, &result1) if err1 != nil { return nil, err1 } @@ -162,7 +162,7 @@ func (s *Server) UpdateNullVolume(_ context.Context, in *pb.UpdateNullVolumeRequ NumBlocks: 64, } var result2 spdk.BdevNullCreateResult - err2 := s.rpc.Call("bdev_null_create", ¶ms2, &result2) + err2 := s.rpc.Call(ctx, "bdev_null_create", ¶ms2, &result2) if err2 != nil { return nil, err2 } @@ -177,7 +177,7 @@ func (s *Server) UpdateNullVolume(_ context.Context, in *pb.UpdateNullVolumeRequ } // ListNullVolumes lists Null volume instances -func (s *Server) ListNullVolumes(_ context.Context, in *pb.ListNullVolumesRequest) (*pb.ListNullVolumesResponse, error) { +func (s *Server) ListNullVolumes(ctx context.Context, in *pb.ListNullVolumesRequest) (*pb.ListNullVolumesResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -188,7 +188,7 @@ func (s *Server) ListNullVolumes(_ context.Context, in *pb.ListNullVolumesReques return nil, perr } var result []spdk.BdevGetBdevsResult - err := s.rpc.Call("bdev_get_bdevs", nil, &result) + err := s.rpc.Call(ctx, "bdev_get_bdevs", nil, &result) if err != nil { return nil, err } @@ -210,7 +210,7 @@ func (s *Server) ListNullVolumes(_ context.Context, in *pb.ListNullVolumesReques } // GetNullVolume gets a a Null volume instance -func (s *Server) GetNullVolume(_ context.Context, in *pb.GetNullVolumeRequest) (*pb.NullVolume, error) { +func (s *Server) GetNullVolume(ctx context.Context, in *pb.GetNullVolumeRequest) (*pb.NullVolume, error) { // check input correctness if err := s.validateGetNullVolumeRequest(in); err != nil { return nil, err @@ -226,7 +226,7 @@ func (s *Server) GetNullVolume(_ context.Context, in *pb.GetNullVolumeRequest) ( Name: resourceID, } var result []spdk.BdevGetBdevsResult - err := s.rpc.Call("bdev_get_bdevs", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_bdevs", ¶ms, &result) if err != nil { return nil, err } @@ -239,7 +239,7 @@ func (s *Server) GetNullVolume(_ context.Context, in *pb.GetNullVolumeRequest) ( } // StatsNullVolume gets a Null volume instance stats -func (s *Server) StatsNullVolume(_ context.Context, in *pb.StatsNullVolumeRequest) (*pb.StatsNullVolumeResponse, error) { +func (s *Server) StatsNullVolume(ctx context.Context, in *pb.StatsNullVolumeRequest) (*pb.StatsNullVolumeResponse, error) { // check input correctness if err := s.validateStatsNullVolumeRequest(in); err != nil { return nil, err @@ -256,7 +256,7 @@ func (s *Server) StatsNullVolume(_ context.Context, in *pb.StatsNullVolumeReques } // See https://mholt.github.io/json-to-go/ var result spdk.BdevGetIostatResult - err := s.rpc.Call("bdev_get_iostat", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_iostat", ¶ms, &result) if err != nil { return nil, err } diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go index 7919f540..3053fef6 100644 --- a/pkg/backend/nvme_path.go +++ b/pkg/backend/nvme_path.go @@ -34,7 +34,7 @@ func sortNvmePaths(paths []*pb.NvmePath) { } // CreateNvmePath creates a new Nvme path -func (s *Server) CreateNvmePath(_ context.Context, in *pb.CreateNvmePathRequest) (*pb.NvmePath, error) { +func (s *Server) CreateNvmePath(ctx context.Context, in *pb.CreateNvmePathRequest) (*pb.NvmePath, error) { // check input correctness if err := s.validateCreateNvmePathRequest(in); err != nil { return nil, err @@ -98,7 +98,7 @@ func (s *Server) CreateNvmePath(_ context.Context, in *pb.CreateNvmePathRequest) Psk: psk, } var result []spdk.BdevNvmeAttachControllerResult - err := s.rpc.Call("bdev_nvme_attach_controller", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_nvme_attach_controller", ¶ms, &result) if err != nil { return nil, err } @@ -110,7 +110,7 @@ func (s *Server) CreateNvmePath(_ context.Context, in *pb.CreateNvmePathRequest) } // DeleteNvmePath deletes a Nvme path -func (s *Server) DeleteNvmePath(_ context.Context, in *pb.DeleteNvmePathRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteNvmePath(ctx context.Context, in *pb.DeleteNvmePathRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteNvmePathRequest(in); err != nil { return nil, err @@ -139,7 +139,7 @@ func (s *Server) DeleteNvmePath(_ context.Context, in *pb.DeleteNvmePathRequest) } var result spdk.BdevNvmeDetachControllerResult - err := s.rpc.Call("bdev_nvme_detach_controller", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_nvme_detach_controller", ¶ms, &result) if err != nil { return nil, err } @@ -155,7 +155,7 @@ func (s *Server) DeleteNvmePath(_ context.Context, in *pb.DeleteNvmePathRequest) } // UpdateNvmePath updates an Nvme path -func (s *Server) UpdateNvmePath(_ context.Context, in *pb.UpdateNvmePathRequest) (*pb.NvmePath, error) { +func (s *Server) UpdateNvmePath(ctx context.Context, in *pb.UpdateNvmePathRequest) (*pb.NvmePath, error) { // check input correctness if err := s.validateUpdateNvmePathRequest(in); err != nil { return nil, err @@ -181,7 +181,7 @@ func (s *Server) UpdateNvmePath(_ context.Context, in *pb.UpdateNvmePathRequest) } // ListNvmePaths lists Nvme path -func (s *Server) ListNvmePaths(_ context.Context, in *pb.ListNvmePathsRequest) (*pb.ListNvmePathsResponse, error) { +func (s *Server) ListNvmePaths(ctx context.Context, in *pb.ListNvmePathsRequest) (*pb.ListNvmePathsResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -192,7 +192,7 @@ func (s *Server) ListNvmePaths(_ context.Context, in *pb.ListNvmePathsRequest) ( return nil, perr } var result []spdk.BdevNvmeGetControllerResult - err := s.rpc.Call("bdev_nvme_get_controllers", nil, &result) + err := s.rpc.Call(ctx, "bdev_nvme_get_controllers", nil, &result) if err != nil { return nil, err } @@ -214,7 +214,7 @@ func (s *Server) ListNvmePaths(_ context.Context, in *pb.ListNvmePathsRequest) ( } // GetNvmePath gets Nvme path -func (s *Server) GetNvmePath(_ context.Context, in *pb.GetNvmePathRequest) (*pb.NvmePath, error) { +func (s *Server) GetNvmePath(ctx context.Context, in *pb.GetNvmePathRequest) (*pb.NvmePath, error) { // check input correctness if err := s.validateGetNvmePathRequest(in); err != nil { return nil, err @@ -227,7 +227,7 @@ func (s *Server) GetNvmePath(_ context.Context, in *pb.GetNvmePathRequest) (*pb. } var result []spdk.BdevNvmeGetControllerResult - err := s.rpc.Call("bdev_nvme_get_controllers", nil, &result) + err := s.rpc.Call(ctx, "bdev_nvme_get_controllers", nil, &result) if err != nil { return nil, err } @@ -244,7 +244,7 @@ func (s *Server) GetNvmePath(_ context.Context, in *pb.GetNvmePathRequest) (*pb. } // StatsNvmePath gets Nvme path stats -func (s *Server) StatsNvmePath(_ context.Context, in *pb.StatsNvmePathRequest) (*pb.StatsNvmePathResponse, error) { +func (s *Server) StatsNvmePath(ctx context.Context, in *pb.StatsNvmePathRequest) (*pb.StatsNvmePathResponse, error) { // check input correctness if err := s.validateStatsNvmePathRequest(in); err != nil { return nil, err @@ -258,7 +258,7 @@ func (s *Server) StatsNvmePath(_ context.Context, in *pb.StatsNvmePathRequest) ( resourceID := path.Base(volume.Name) log.Printf("TODO: send name to SPDK and get back stats: %v", resourceID) var result spdk.NvmfGetSubsystemStatsResult - err := s.rpc.Call("nvmf_get_stats", nil, &result) + err := s.rpc.Call(ctx, "nvmf_get_stats", nil, &result) if err != nil { return nil, err } diff --git a/pkg/frontend/blk.go b/pkg/frontend/blk.go index 32d9c92b..f80c689c 100644 --- a/pkg/frontend/blk.go +++ b/pkg/frontend/blk.go @@ -33,7 +33,7 @@ func sortVirtioBlks(virtioBlks []*pb.VirtioBlk) { } // CreateVirtioBlk creates a Virtio block device -func (s *Server) CreateVirtioBlk(_ context.Context, in *pb.CreateVirtioBlkRequest) (*pb.VirtioBlk, error) { +func (s *Server) CreateVirtioBlk(ctx context.Context, in *pb.CreateVirtioBlkRequest) (*pb.VirtioBlk, error) { // check input correctness if err := s.validateCreateVirtioBlkRequest(in); err != nil { return nil, err @@ -59,7 +59,7 @@ func (s *Server) CreateVirtioBlk(_ context.Context, in *pb.CreateVirtioBlkReques } var result spdk.VhostCreateBlkControllerResult - err = s.rpc.Call("vhost_create_blk_controller", ¶ms, &result) + err = s.rpc.Call(ctx, "vhost_create_blk_controller", ¶ms, &result) if err != nil { return nil, err } @@ -75,7 +75,7 @@ func (s *Server) CreateVirtioBlk(_ context.Context, in *pb.CreateVirtioBlkReques } // DeleteVirtioBlk deletes a Virtio block device -func (s *Server) DeleteVirtioBlk(_ context.Context, in *pb.DeleteVirtioBlkRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteVirtioBlk(ctx context.Context, in *pb.DeleteVirtioBlkRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteVirtioBlkRequest(in); err != nil { return nil, err @@ -97,7 +97,7 @@ func (s *Server) DeleteVirtioBlk(_ context.Context, in *pb.DeleteVirtioBlkReques } var result spdk.VhostDeleteControllerResult - err = s.rpc.Call("vhost_delete_controller", ¶ms, &result) + err = s.rpc.Call(ctx, "vhost_delete_controller", ¶ms, &result) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func (s *Server) DeleteVirtioBlk(_ context.Context, in *pb.DeleteVirtioBlkReques } // UpdateVirtioBlk updates a Virtio block device -func (s *Server) UpdateVirtioBlk(_ context.Context, in *pb.UpdateVirtioBlkRequest) (*pb.VirtioBlk, error) { +func (s *Server) UpdateVirtioBlk(ctx context.Context, in *pb.UpdateVirtioBlkRequest) (*pb.VirtioBlk, error) { // check input correctness if err := s.validateUpdateVirtioBlkRequest(in); err != nil { return nil, err @@ -135,7 +135,7 @@ func (s *Server) UpdateVirtioBlk(_ context.Context, in *pb.UpdateVirtioBlkReques } // ListVirtioBlks lists Virtio block devices -func (s *Server) ListVirtioBlks(_ context.Context, in *pb.ListVirtioBlksRequest) (*pb.ListVirtioBlksResponse, error) { +func (s *Server) ListVirtioBlks(ctx context.Context, in *pb.ListVirtioBlksRequest) (*pb.ListVirtioBlksResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -146,7 +146,7 @@ func (s *Server) ListVirtioBlks(_ context.Context, in *pb.ListVirtioBlksRequest) return nil, perr } var result []spdk.VhostGetControllersResult - err := s.rpc.Call("vhost_get_controllers", nil, &result) + err := s.rpc.Call(ctx, "vhost_get_controllers", nil, &result) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (s *Server) ListVirtioBlks(_ context.Context, in *pb.ListVirtioBlksRequest) } // GetVirtioBlk gets a Virtio block device -func (s *Server) GetVirtioBlk(_ context.Context, in *pb.GetVirtioBlkRequest) (*pb.VirtioBlk, error) { +func (s *Server) GetVirtioBlk(ctx context.Context, in *pb.GetVirtioBlkRequest) (*pb.VirtioBlk, error) { // check input correctness if err := s.validateGetVirtioBlkRequest(in); err != nil { return nil, err @@ -192,7 +192,7 @@ func (s *Server) GetVirtioBlk(_ context.Context, in *pb.GetVirtioBlkRequest) (*p Name: resourceID, } var result []spdk.VhostGetControllersResult - err := s.rpc.Call("vhost_get_controllers", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_get_controllers", ¶ms, &result) if err != nil { return nil, err } @@ -212,7 +212,7 @@ func (s *Server) GetVirtioBlk(_ context.Context, in *pb.GetVirtioBlkRequest) (*p } // StatsVirtioBlk gets a Virtio block device stats -func (s *Server) StatsVirtioBlk(_ context.Context, in *pb.StatsVirtioBlkRequest) (*pb.StatsVirtioBlkResponse, error) { +func (s *Server) StatsVirtioBlk(ctx context.Context, in *pb.StatsVirtioBlkRequest) (*pb.StatsVirtioBlkResponse, error) { log.Printf("StatsVirtioBlk: Received from client: %v", in) // check input correctness if err := s.validateStatsVirtioBlkRequest(in); err != nil { diff --git a/pkg/frontend/nvme_controller.go b/pkg/frontend/nvme_controller.go index 5396a3e9..e17141a9 100644 --- a/pkg/frontend/nvme_controller.go +++ b/pkg/frontend/nvme_controller.go @@ -33,7 +33,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 @@ -71,7 +71,7 @@ func (s *Server) CreateNvmeController(_ context.Context, in *pb.CreateNvmeContro } var result spdk.NvmfSubsystemAddListenerResult - err = s.rpc.Call("nvmf_subsystem_add_listener", ¶ms, &result) + err = s.rpc.Call(ctx, "nvmf_subsystem_add_listener", ¶ms, &result) if err != nil { return nil, err } @@ -89,7 +89,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 } var result spdk.NvmfSubsystemAddListenerResult - err = s.rpc.Call("nvmf_subsystem_remove_listener", ¶ms, &result) + err = s.rpc.Call(ctx, "nvmf_subsystem_remove_listener", ¶ms, &result) if err != nil { return nil, err } @@ -138,7 +138,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 @@ -165,7 +165,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 @@ -182,7 +182,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 @@ -197,7 +197,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 diff --git a/pkg/frontend/nvme_namespace.go b/pkg/frontend/nvme_namespace.go index 7588303a..7db582b0 100644 --- a/pkg/frontend/nvme_namespace.go +++ b/pkg/frontend/nvme_namespace.go @@ -32,7 +32,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 @@ -67,7 +67,7 @@ func (s *Server) CreateNvmeNamespace(_ context.Context, in *pb.CreateNvmeNamespa params.Namespace.BdevName = in.NvmeNamespace.Spec.VolumeNameRef var result spdk.NvmfSubsystemAddNsResult - err := s.rpc.Call("nvmf_subsystem_add_ns", ¶ms, &result) + err := s.rpc.Call(ctx, "nvmf_subsystem_add_ns", ¶ms, &result) if err != nil { return nil, err } @@ -85,7 +85,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 @@ -111,7 +111,7 @@ func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespa Nsid: int(namespace.Spec.HostNsid), } var result spdk.NvmfSubsystemRemoveNsResult - err := s.rpc.Call("nvmf_subsystem_remove_ns", ¶ms, &result) + err := s.rpc.Call(ctx, "nvmf_subsystem_remove_ns", ¶ms, &result) if err != nil { return nil, err } @@ -125,7 +125,7 @@ func (s *Server) DeleteNvmeNamespace(_ context.Context, in *pb.DeleteNvmeNamespa } // UpdateNvmeNamespace updates an Nvme namespace -func (s *Server) UpdateNvmeNamespace(_ context.Context, in *pb.UpdateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { +func (s *Server) UpdateNvmeNamespace(ctx context.Context, in *pb.UpdateNvmeNamespaceRequest) (*pb.NvmeNamespace, error) { // check input correctness if err := s.validateUpdateNvmeNamespaceRequest(in); err != nil { return nil, err @@ -153,7 +153,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 @@ -172,7 +172,7 @@ func (s *Server) ListNvmeNamespaces(_ context.Context, in *pb.ListNvmeNamespaces nqn := subsys.Spec.Nqn var result []spdk.NvmfGetSubsystemsResult - err := s.rpc.Call("nvmf_get_subsystems", nil, &result) + err := s.rpc.Call(ctx, "nvmf_get_subsystems", nil, &result) if err != nil { return nil, err } @@ -205,7 +205,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 @@ -228,7 +228,7 @@ func (s *Server) GetNvmeNamespace(_ context.Context, in *pb.GetNvmeNamespaceRequ } var result []spdk.NvmfGetSubsystemsResult - err := s.rpc.Call("nvmf_get_subsystems", nil, &result) + err := s.rpc.Call(ctx, "nvmf_get_subsystems", nil, &result) if err != nil { return nil, err } @@ -255,7 +255,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 diff --git a/pkg/frontend/nvme_subsystem.go b/pkg/frontend/nvme_subsystem.go index 107cad2b..c144d83b 100644 --- a/pkg/frontend/nvme_subsystem.go +++ b/pkg/frontend/nvme_subsystem.go @@ -33,7 +33,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 @@ -67,7 +67,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst MaxNamespaces: int(in.NvmeSubsystem.Spec.MaxNamespaces), } var result spdk.NvmfCreateSubsystemResult - err := s.rpc.Call("nvmf_create_subsystem", ¶ms, &result) + err := s.rpc.Call(ctx, "nvmf_create_subsystem", ¶ms, &result) if err != nil { return nil, err } @@ -98,7 +98,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst Psk: psk, } var result spdk.NvmfSubsystemAddHostResult - err = s.rpc.Call("nvmf_subsystem_add_host", ¶ms, &result) + err = s.rpc.Call(ctx, "nvmf_subsystem_add_host", ¶ms, &result) if err != nil { return nil, err } @@ -110,7 +110,7 @@ func (s *Server) CreateNvmeSubsystem(_ context.Context, in *pb.CreateNvmeSubsyst } // get SPDK version 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 } @@ -122,7 +122,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 @@ -140,7 +140,7 @@ func (s *Server) DeleteNvmeSubsystem(_ context.Context, in *pb.DeleteNvmeSubsyst Nqn: subsys.Spec.Nqn, } var result spdk.NvmfDeleteSubsystemResult - err := s.rpc.Call("nvmf_delete_subsystem", ¶ms, &result) + err := s.rpc.Call(ctx, "nvmf_delete_subsystem", ¶ms, &result) if err != nil { return nil, err } @@ -154,7 +154,7 @@ func (s *Server) DeleteNvmeSubsystem(_ context.Context, in *pb.DeleteNvmeSubsyst } // UpdateNvmeSubsystem updates an Nvme Subsystem -func (s *Server) UpdateNvmeSubsystem(_ context.Context, in *pb.UpdateNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { +func (s *Server) UpdateNvmeSubsystem(ctx context.Context, in *pb.UpdateNvmeSubsystemRequest) (*pb.NvmeSubsystem, error) { // check input correctness if err := s.validateUpdateNvmeSubsystemRequest(in); err != nil { return nil, err @@ -178,7 +178,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 @@ -189,7 +189,7 @@ func (s *Server) ListNvmeSubsystems(_ context.Context, in *pb.ListNvmeSubsystems return nil, perr } var result []spdk.NvmfGetSubsystemsResult - err := s.rpc.Call("nvmf_get_subsystems", nil, &result) + err := s.rpc.Call(ctx, "nvmf_get_subsystems", nil, &result) if err != nil { return nil, err } @@ -211,7 +211,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 @@ -224,7 +224,7 @@ func (s *Server) GetNvmeSubsystem(_ context.Context, in *pb.GetNvmeSubsystemRequ } var result []spdk.NvmfGetSubsystemsResult - err := s.rpc.Call("nvmf_get_subsystems", nil, &result) + err := s.rpc.Call(ctx, "nvmf_get_subsystems", nil, &result) if err != nil { return nil, err } @@ -241,7 +241,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 @@ -255,7 +255,7 @@ func (s *Server) StatsNvmeSubsystem(_ context.Context, in *pb.StatsNvmeSubsystem resourceID := path.Base(subsys.Name) log.Printf("TODO: send name to SPDK and get back stats: %v", resourceID) var result spdk.NvmfGetSubsystemStatsResult - err := s.rpc.Call("nvmf_get_stats", nil, &result) + err := s.rpc.Call(ctx, "nvmf_get_stats", nil, &result) if err != nil { return nil, err } diff --git a/pkg/frontend/scsi.go b/pkg/frontend/scsi.go index 559dbe1e..ec513c00 100644 --- a/pkg/frontend/scsi.go +++ b/pkg/frontend/scsi.go @@ -33,7 +33,7 @@ func sortScsiControllers(controllers []*pb.VirtioScsiController) { } // CreateVirtioScsiController creates a Virtio SCSI controller -func (s *Server) CreateVirtioScsiController(_ context.Context, in *pb.CreateVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { +func (s *Server) CreateVirtioScsiController(ctx context.Context, in *pb.CreateVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -61,7 +61,7 @@ func (s *Server) CreateVirtioScsiController(_ context.Context, in *pb.CreateVirt Ctrlr: resourceID, } var result spdk.VhostCreateScsiControllerResult - err := s.rpc.Call("vhost_create_scsi_controller", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_create_scsi_controller", ¶ms, &result) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (s *Server) CreateVirtioScsiController(_ context.Context, in *pb.CreateVirt } // DeleteVirtioScsiController deletes a Virtio SCSI controller -func (s *Server) DeleteVirtioScsiController(_ context.Context, in *pb.DeleteVirtioScsiControllerRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteVirtioScsiController(ctx context.Context, in *pb.DeleteVirtioScsiControllerRequest) (*emptypb.Empty, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -99,7 +99,7 @@ func (s *Server) DeleteVirtioScsiController(_ context.Context, in *pb.DeleteVirt Ctrlr: resourceID, } var result spdk.VhostDeleteControllerResult - err := s.rpc.Call("vhost_delete_controller", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_delete_controller", ¶ms, &result) if err != nil { return nil, err } @@ -112,7 +112,7 @@ func (s *Server) DeleteVirtioScsiController(_ context.Context, in *pb.DeleteVirt } // UpdateVirtioScsiController updates a Virtio SCSI controller -func (s *Server) UpdateVirtioScsiController(_ context.Context, in *pb.UpdateVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { +func (s *Server) UpdateVirtioScsiController(ctx context.Context, in *pb.UpdateVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -140,7 +140,7 @@ func (s *Server) UpdateVirtioScsiController(_ context.Context, in *pb.UpdateVirt } // ListVirtioScsiControllers lists Virtio SCSI controllers -func (s *Server) ListVirtioScsiControllers(_ context.Context, in *pb.ListVirtioScsiControllersRequest) (*pb.ListVirtioScsiControllersResponse, error) { +func (s *Server) ListVirtioScsiControllers(ctx context.Context, in *pb.ListVirtioScsiControllersRequest) (*pb.ListVirtioScsiControllersResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -151,7 +151,7 @@ func (s *Server) ListVirtioScsiControllers(_ context.Context, in *pb.ListVirtioS return nil, perr } var result []spdk.VhostGetControllersResult - err := s.rpc.Call("vhost_get_controllers", nil, &result) + err := s.rpc.Call(ctx, "vhost_get_controllers", nil, &result) if err != nil { return nil, err } @@ -173,7 +173,7 @@ func (s *Server) ListVirtioScsiControllers(_ context.Context, in *pb.ListVirtioS } // GetVirtioScsiController gets a Virtio SCSI controller -func (s *Server) GetVirtioScsiController(_ context.Context, in *pb.GetVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { +func (s *Server) GetVirtioScsiController(ctx context.Context, in *pb.GetVirtioScsiControllerRequest) (*pb.VirtioScsiController, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -193,7 +193,7 @@ func (s *Server) GetVirtioScsiController(_ context.Context, in *pb.GetVirtioScsi Name: resourceID, } var result []spdk.VhostGetControllersResult - err := s.rpc.Call("vhost_get_controllers", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_get_controllers", ¶ms, &result) if err != nil { return nil, err } @@ -206,7 +206,7 @@ func (s *Server) GetVirtioScsiController(_ context.Context, in *pb.GetVirtioScsi } // StatsVirtioScsiController gets a Virtio SCSI controller stats -func (s *Server) StatsVirtioScsiController(_ context.Context, in *pb.StatsVirtioScsiControllerRequest) (*pb.StatsVirtioScsiControllerResponse, error) { +func (s *Server) StatsVirtioScsiController(ctx context.Context, in *pb.StatsVirtioScsiControllerRequest) (*pb.StatsVirtioScsiControllerResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -227,7 +227,7 @@ func (s *Server) StatsVirtioScsiController(_ context.Context, in *pb.StatsVirtio } // CreateVirtioScsiLun creates a Virtio SCSI LUN -func (s *Server) CreateVirtioScsiLun(_ context.Context, in *pb.CreateVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { +func (s *Server) CreateVirtioScsiLun(ctx context.Context, in *pb.CreateVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -265,7 +265,7 @@ func (s *Server) CreateVirtioScsiLun(_ context.Context, in *pb.CreateVirtioScsiL Bdev: in.VirtioScsiLun.VolumeNameRef, } var result int - err := s.rpc.Call("vhost_scsi_controller_add_target", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_scsi_controller_add_target", ¶ms, &result) if err != nil { return nil, err } @@ -277,7 +277,7 @@ func (s *Server) CreateVirtioScsiLun(_ context.Context, in *pb.CreateVirtioScsiL } // DeleteVirtioScsiLun deletes a Virtio SCSI LUN -func (s *Server) DeleteVirtioScsiLun(_ context.Context, in *pb.DeleteVirtioScsiLunRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteVirtioScsiLun(ctx context.Context, in *pb.DeleteVirtioScsiLunRequest) (*emptypb.Empty, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -304,7 +304,7 @@ func (s *Server) DeleteVirtioScsiLun(_ context.Context, in *pb.DeleteVirtioScsiL Num: 5, } var result bool - err := s.rpc.Call("vhost_scsi_controller_remove_target", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_scsi_controller_remove_target", ¶ms, &result) if err != nil { return nil, err } @@ -317,7 +317,7 @@ func (s *Server) DeleteVirtioScsiLun(_ context.Context, in *pb.DeleteVirtioScsiL } // UpdateVirtioScsiLun updates a Virtio SCSI LUN -func (s *Server) UpdateVirtioScsiLun(_ context.Context, in *pb.UpdateVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { +func (s *Server) UpdateVirtioScsiLun(ctx context.Context, in *pb.UpdateVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -345,7 +345,7 @@ func (s *Server) UpdateVirtioScsiLun(_ context.Context, in *pb.UpdateVirtioScsiL } // ListVirtioScsiLuns lists Virtio SCSI LUNs -func (s *Server) ListVirtioScsiLuns(_ context.Context, in *pb.ListVirtioScsiLunsRequest) (*pb.ListVirtioScsiLunsResponse, error) { +func (s *Server) ListVirtioScsiLuns(ctx context.Context, in *pb.ListVirtioScsiLunsRequest) (*pb.ListVirtioScsiLunsResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -356,7 +356,7 @@ func (s *Server) ListVirtioScsiLuns(_ context.Context, in *pb.ListVirtioScsiLuns return nil, perr } var result []spdk.VhostGetControllersResult - err := s.rpc.Call("vhost_get_controllers", nil, &result) + err := s.rpc.Call(ctx, "vhost_get_controllers", nil, &result) if err != nil { return nil, err } @@ -379,7 +379,7 @@ func (s *Server) ListVirtioScsiLuns(_ context.Context, in *pb.ListVirtioScsiLuns } // GetVirtioScsiLun gets a Virtio SCSI LUN -func (s *Server) GetVirtioScsiLun(_ context.Context, in *pb.GetVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { +func (s *Server) GetVirtioScsiLun(ctx context.Context, in *pb.GetVirtioScsiLunRequest) (*pb.VirtioScsiLun, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -399,7 +399,7 @@ func (s *Server) GetVirtioScsiLun(_ context.Context, in *pb.GetVirtioScsiLunRequ Name: resourceID, } var result []spdk.VhostGetControllersResult - err := s.rpc.Call("vhost_get_controllers", ¶ms, &result) + err := s.rpc.Call(ctx, "vhost_get_controllers", ¶ms, &result) if err != nil { return nil, err } @@ -412,7 +412,7 @@ func (s *Server) GetVirtioScsiLun(_ context.Context, in *pb.GetVirtioScsiLunRequ } // StatsVirtioScsiLun gets a Virtio SCSI LUN stats -func (s *Server) StatsVirtioScsiLun(_ context.Context, in *pb.StatsVirtioScsiLunRequest) (*pb.StatsVirtioScsiLunResponse, error) { +func (s *Server) StatsVirtioScsiLun(ctx context.Context, in *pb.StatsVirtioScsiLunRequest) (*pb.StatsVirtioScsiLunResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err diff --git a/pkg/middleend/encryption.go b/pkg/middleend/encryption.go index 3ee1feda..403a506f 100644 --- a/pkg/middleend/encryption.go +++ b/pkg/middleend/encryption.go @@ -32,7 +32,7 @@ func sortEncryptedVolumes(volumes []*pb.EncryptedVolume) { } // CreateEncryptedVolume creates an encrypted volume -func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) { +func (s *Server) CreateEncryptedVolume(ctx context.Context, in *pb.CreateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) { // check input correctness if err := s.validateCreateEncryptedVolumeRequest(in); err != nil { return nil, err @@ -59,7 +59,7 @@ func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncrypted // first create a key params1 := s.getAccelCryptoKeyCreateParams(in.EncryptedVolume) var result1 spdk.AccelCryptoKeyCreateResult - err1 := s.rpc.Call("accel_crypto_key_create", ¶ms1, &result1) + err1 := s.rpc.Call(ctx, "accel_crypto_key_create", ¶ms1, &result1) if err1 != nil { return nil, err1 } @@ -75,7 +75,7 @@ func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncrypted KeyName: resourceID, } var result spdk.BdevCryptoCreateResult - err := s.rpc.Call("bdev_crypto_create", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_crypto_create", ¶ms, &result) if err != nil { return nil, err } @@ -90,7 +90,7 @@ func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncrypted } // DeleteEncryptedVolume deletes an encrypted volume -func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncryptedVolumeRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteEncryptedVolume(ctx context.Context, in *pb.DeleteEncryptedVolumeRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteEncryptedVolumeRequest(in); err != nil { return nil, err @@ -109,7 +109,7 @@ func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncrypted Name: resourceID, } var bdevCryptoDeleteResult spdk.BdevCryptoDeleteResult - err := s.rpc.Call("bdev_crypto_delete", &bdevCryptoDeleteParams, &bdevCryptoDeleteResult) + err := s.rpc.Call(ctx, "bdev_crypto_delete", &bdevCryptoDeleteParams, &bdevCryptoDeleteResult) if err != nil { return nil, err } @@ -123,7 +123,7 @@ func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncrypted KeyName: resourceID, } var keyDestroyResult spdk.AccelCryptoKeyDestroyResult - err = s.rpc.Call("accel_crypto_key_destroy", &keyDestroyParams, &keyDestroyResult) + err = s.rpc.Call(ctx, "accel_crypto_key_destroy", &keyDestroyParams, &keyDestroyResult) if err != nil { return nil, err } @@ -138,7 +138,7 @@ func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncrypted } // UpdateEncryptedVolume updates an encrypted volume -func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) { +func (s *Server) UpdateEncryptedVolume(ctx context.Context, in *pb.UpdateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) { // check input correctness if err := s.validateUpdateEncryptedVolumeRequest(in); err != nil { return nil, err @@ -153,7 +153,7 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted Name: resourceID, } var result1 spdk.BdevCryptoDeleteResult - err1 := s.rpc.Call("bdev_crypto_delete", ¶ms1, &result1) + err1 := s.rpc.Call(ctx, "bdev_crypto_delete", ¶ms1, &result1) if err1 != nil { return nil, err1 } @@ -167,7 +167,7 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted KeyName: resourceID, } var result0 spdk.AccelCryptoKeyDestroyResult - err0 := s.rpc.Call("accel_crypto_key_destroy", ¶ms0, &result0) + err0 := s.rpc.Call(ctx, "accel_crypto_key_destroy", ¶ms0, &result0) if err0 != nil { return nil, err0 } @@ -178,7 +178,7 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted } params2 := s.getAccelCryptoKeyCreateParams(in.EncryptedVolume) var result2 spdk.AccelCryptoKeyCreateResult - err2 := s.rpc.Call("accel_crypto_key_create", ¶ms2, &result2) + err2 := s.rpc.Call(ctx, "accel_crypto_key_create", ¶ms2, &result2) if err2 != nil { return nil, err2 } @@ -194,7 +194,7 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted KeyName: resourceID, } var result3 spdk.BdevCryptoCreateResult - err3 := s.rpc.Call("bdev_crypto_create", ¶ms3, &result3) + err3 := s.rpc.Call(ctx, "bdev_crypto_create", ¶ms3, &result3) if err3 != nil { return nil, err3 } @@ -209,7 +209,7 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted } // ListEncryptedVolumes lists encrypted volumes -func (s *Server) ListEncryptedVolumes(_ context.Context, in *pb.ListEncryptedVolumesRequest) (*pb.ListEncryptedVolumesResponse, error) { +func (s *Server) ListEncryptedVolumes(ctx context.Context, in *pb.ListEncryptedVolumesRequest) (*pb.ListEncryptedVolumesResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -220,7 +220,7 @@ func (s *Server) ListEncryptedVolumes(_ context.Context, in *pb.ListEncryptedVol return nil, perr } var result []spdk.BdevGetBdevsResult - err := s.rpc.Call("bdev_get_bdevs", nil, &result) + err := s.rpc.Call(ctx, "bdev_get_bdevs", nil, &result) if err != nil { return nil, err } @@ -243,7 +243,7 @@ func (s *Server) ListEncryptedVolumes(_ context.Context, in *pb.ListEncryptedVol } // GetEncryptedVolume gets an encrypted volume -func (s *Server) GetEncryptedVolume(_ context.Context, in *pb.GetEncryptedVolumeRequest) (*pb.EncryptedVolume, error) { +func (s *Server) GetEncryptedVolume(ctx context.Context, in *pb.GetEncryptedVolumeRequest) (*pb.EncryptedVolume, error) { // check input correctness if err := s.validateGetEncryptedVolumeRequest(in); err != nil { return nil, err @@ -259,7 +259,7 @@ func (s *Server) GetEncryptedVolume(_ context.Context, in *pb.GetEncryptedVolume Name: resourceID, } var result []spdk.BdevGetBdevsResult - err := s.rpc.Call("bdev_get_bdevs", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_bdevs", ¶ms, &result) if err != nil { return nil, err } @@ -272,7 +272,7 @@ func (s *Server) GetEncryptedVolume(_ context.Context, in *pb.GetEncryptedVolume } // StatsEncryptedVolume gets an encrypted volume stats -func (s *Server) StatsEncryptedVolume(_ context.Context, in *pb.StatsEncryptedVolumeRequest) (*pb.StatsEncryptedVolumeResponse, error) { +func (s *Server) StatsEncryptedVolume(ctx context.Context, in *pb.StatsEncryptedVolumeRequest) (*pb.StatsEncryptedVolumeResponse, error) { // check input correctness if err := s.validateStatsEncryptedVolumeRequest(in); err != nil { return nil, err @@ -289,7 +289,7 @@ func (s *Server) StatsEncryptedVolume(_ context.Context, in *pb.StatsEncryptedVo } // See https://mholt.github.io/json-to-go/ var result spdk.BdevGetIostatResult - err := s.rpc.Call("bdev_get_iostat", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_iostat", ¶ms, &result) if err != nil { return nil, err } diff --git a/pkg/middleend/qos.go b/pkg/middleend/qos.go index 186e3c4b..b53d312a 100644 --- a/pkg/middleend/qos.go +++ b/pkg/middleend/qos.go @@ -29,7 +29,7 @@ func sortQosVolumes(volumes []*pb.QosVolume) { } // CreateQosVolume creates a QoS volume -func (s *Server) CreateQosVolume(_ context.Context, in *pb.CreateQosVolumeRequest) (*pb.QosVolume, error) { +func (s *Server) CreateQosVolume(ctx context.Context, in *pb.CreateQosVolumeRequest) (*pb.QosVolume, error) { // check input correctness if err := s.validateCreateQosVolumeRequest(in); err != nil { return nil, err @@ -50,7 +50,7 @@ func (s *Server) CreateQosVolume(_ context.Context, in *pb.CreateQosVolumeReques return volume, nil } - if err := s.setMaxLimit(in.QosVolume.VolumeNameRef, in.QosVolume.Limits.Max); err != nil { + if err := s.setMaxLimit(ctx, in.QosVolume.VolumeNameRef, in.QosVolume.Limits.Max); err != nil { return nil, err } @@ -61,7 +61,7 @@ func (s *Server) CreateQosVolume(_ context.Context, in *pb.CreateQosVolumeReques } // DeleteQosVolume deletes a QoS volume -func (s *Server) DeleteQosVolume(_ context.Context, in *pb.DeleteQosVolumeRequest) (*emptypb.Empty, error) { +func (s *Server) DeleteQosVolume(ctx context.Context, in *pb.DeleteQosVolumeRequest) (*emptypb.Empty, error) { // check input correctness if err := s.validateDeleteQosVolumeRequest(in); err != nil { return nil, err @@ -76,7 +76,7 @@ func (s *Server) DeleteQosVolume(_ context.Context, in *pb.DeleteQosVolumeReques return nil, err } - if err := s.cleanMaxLimit(qosVolume.VolumeNameRef); err != nil { + if err := s.cleanMaxLimit(ctx, qosVolume.VolumeNameRef); err != nil { return nil, err } @@ -85,7 +85,7 @@ func (s *Server) DeleteQosVolume(_ context.Context, in *pb.DeleteQosVolumeReques } // UpdateQosVolume updates a QoS volume -func (s *Server) UpdateQosVolume(_ context.Context, in *pb.UpdateQosVolumeRequest) (*pb.QosVolume, error) { +func (s *Server) UpdateQosVolume(ctx context.Context, in *pb.UpdateQosVolumeRequest) (*pb.QosVolume, error) { // check input correctness if err := s.validateUpdateQosVolumeRequest(in); err != nil { return nil, err @@ -107,7 +107,7 @@ func (s *Server) UpdateQosVolume(_ context.Context, in *pb.UpdateQosVolumeReques return nil, status.Errorf(codes.InvalidArgument, msg) } log.Println("Set new max limit values") - if err := s.setMaxLimit(in.QosVolume.VolumeNameRef, in.QosVolume.Limits.Max); err != nil { + if err := s.setMaxLimit(ctx, in.QosVolume.VolumeNameRef, in.QosVolume.Limits.Max); err != nil { return nil, err } @@ -116,7 +116,7 @@ func (s *Server) UpdateQosVolume(_ context.Context, in *pb.UpdateQosVolumeReques } // ListQosVolumes lists QoS volumes -func (s *Server) ListQosVolumes(_ context.Context, in *pb.ListQosVolumesRequest) (*pb.ListQosVolumesResponse, error) { +func (s *Server) ListQosVolumes(ctx context.Context, in *pb.ListQosVolumesRequest) (*pb.ListQosVolumesResponse, error) { // check required fields if err := fieldbehavior.ValidateRequiredFields(in); err != nil { return nil, err @@ -145,7 +145,7 @@ func (s *Server) ListQosVolumes(_ context.Context, in *pb.ListQosVolumesRequest) } // GetQosVolume gets a QoS volume -func (s *Server) GetQosVolume(_ context.Context, in *pb.GetQosVolumeRequest) (*pb.QosVolume, error) { +func (s *Server) GetQosVolume(ctx context.Context, in *pb.GetQosVolumeRequest) (*pb.QosVolume, error) { // check input correctness if err := s.validateGetQosVolumeRequest(in); err != nil { return nil, err @@ -160,7 +160,7 @@ func (s *Server) GetQosVolume(_ context.Context, in *pb.GetQosVolumeRequest) (*p } // StatsQosVolume gets a QoS volume stats -func (s *Server) StatsQosVolume(_ context.Context, in *pb.StatsQosVolumeRequest) (*pb.StatsQosVolumeResponse, error) { +func (s *Server) StatsQosVolume(ctx context.Context, in *pb.StatsQosVolumeRequest) (*pb.StatsQosVolumeResponse, error) { // check input correctness if err := s.validateStatsQosVolumeRequest(in); err != nil { return nil, err @@ -175,7 +175,7 @@ func (s *Server) StatsQosVolume(_ context.Context, in *pb.StatsQosVolumeRequest) Name: volume.VolumeNameRef, } var result spdk.BdevGetIostatResult - err := s.rpc.Call("bdev_get_iostat", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_get_iostat", ¶ms, &result) if err != nil { return nil, spdk.ErrFailedSpdkCall } @@ -199,7 +199,7 @@ func (s *Server) StatsQosVolume(_ context.Context, in *pb.StatsQosVolumeRequest) }}, nil } -func (s *Server) setMaxLimit(underlyingVolume string, limit *pb.QosLimit) error { +func (s *Server) setMaxLimit(ctx context.Context, underlyingVolume string, limit *pb.QosLimit) error { params := spdk.BdevQoSParams{ Name: underlyingVolume, RwIosPerSec: int(limit.RwIopsKiops * 1000), @@ -208,7 +208,7 @@ func (s *Server) setMaxLimit(underlyingVolume string, limit *pb.QosLimit) error WMbytesPerSec: int(limit.WrBandwidthMbs), } var result spdk.BdevQoSResult - err := s.rpc.Call("bdev_set_qos_limit", ¶ms, &result) + err := s.rpc.Call(ctx, "bdev_set_qos_limit", ¶ms, &result) if err != nil { return spdk.ErrFailedSpdkCall } @@ -222,6 +222,6 @@ func (s *Server) setMaxLimit(underlyingVolume string, limit *pb.QosLimit) error return nil } -func (s *Server) cleanMaxLimit(underlyingVolume string) error { - return s.setMaxLimit(underlyingVolume, &pb.QosLimit{}) +func (s *Server) cleanMaxLimit(ctx context.Context, underlyingVolume string) error { + return s.setMaxLimit(ctx, underlyingVolume, &pb.QosLimit{}) }