Skip to content

Commit

Permalink
refactor(middleend): remove excessive logs
Browse files Browse the repository at this point in the history 
Signed-off-by: Artsiom Koltun <artsiom.koltun@intel.com>
  • Loading branch information
@artek-koltun @glimchb
artek-koltun authored and glimchb committed Sep 28, 2023
1 parent 167cb32 commit bd7b947
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 62 deletions.
40 changes: 0 additions & 40 deletions pkg/middleend/encryption.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ func sortEncryptedVolumes(volumes []*pb.EncryptedVolume) {

// CreateEncryptedVolume creates an encrypted volume
func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncryptedVolumeRequest) (*pb.EncryptedVolume, error) {
log.Printf("CreateEncryptedVolume: Received from client: %v", in)
// check input correctness
if err := s.validateCreateEncryptedVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// see https://google.aip.dev/133#user-specified-ids
Expand All @@ -48,7 +46,6 @@ func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncrypted
in.EncryptedVolume.Name = utils.ResourceIDToVolumeName(resourceID)

if err := s.verifyEncryptedVolume(in.EncryptedVolume); err != nil {
log.Printf("error: %v", err)
return nil, status.Error(codes.InvalidArgument, err.Error())
}

Expand All @@ -64,13 +61,11 @@ func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncrypted
var result1 spdk.AccelCryptoKeyCreateResult
err1 := s.rpc.Call("accel_crypto_key_create", &params1, &result1)
if err1 != nil {
log.Printf("error: %v", err1)
return nil, err1
}
log.Printf("Received from SPDK: %v", result1)
if !result1 {
msg := fmt.Sprintf("Could not create Crypto Key: %s", string(in.EncryptedVolume.Key))
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
// create bdev now
Expand All @@ -82,27 +77,22 @@ func (s *Server) CreateEncryptedVolume(_ context.Context, in *pb.CreateEncrypted
var result spdk.BdevCryptoCreateResult
err := s.rpc.Call("bdev_crypto_create", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if result == "" {
msg := fmt.Sprintf("Could not create Crypto Dev: %s", params.Name)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
response := utils.ProtoClone(in.EncryptedVolume)
s.volumes.encVolumes[in.EncryptedVolume.Name] = response
log.Printf("CreateEncryptedVolume: Sending to client: %v", response)
return response, nil
}

// DeleteEncryptedVolume deletes an encrypted volume
func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncryptedVolumeRequest) (*emptypb.Empty, error) {
log.Printf("DeleteEncryptedVolume: Received from client: %v", in)
// check input correctness
if err := s.validateDeleteEncryptedVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
Expand All @@ -112,7 +102,6 @@ func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncrypted
return &emptypb.Empty{}, nil
}
err := status.Errorf(codes.NotFound, "unable to find key %s", in.Name)
log.Printf("error: %v", err)
return nil, err
}
resourceID := path.Base(volume.Name)
Expand All @@ -122,13 +111,11 @@ func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncrypted
var bdevCryptoDeleteResult spdk.BdevCryptoDeleteResult
err := s.rpc.Call("bdev_crypto_delete", &bdevCryptoDeleteParams, &bdevCryptoDeleteResult)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", bdevCryptoDeleteResult)
if !bdevCryptoDeleteResult {
msg := fmt.Sprintf("Could not delete Crypto: %s", bdevCryptoDeleteParams.Name)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}

Expand All @@ -138,13 +125,11 @@ func (s *Server) DeleteEncryptedVolume(_ context.Context, in *pb.DeleteEncrypted
var keyDestroyResult spdk.AccelCryptoKeyDestroyResult
err = s.rpc.Call("accel_crypto_key_destroy", &keyDestroyParams, &keyDestroyResult)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", keyDestroyResult)
if !keyDestroyResult {
msg := fmt.Sprintf("Could not destroy Crypto Key: %v", keyDestroyParams.KeyName)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}

Expand All @@ -154,15 +139,12 @@ 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) {
log.Printf("UpdateEncryptedVolume: Received from client: %v", in)
// check input correctness
if err := s.validateUpdateEncryptedVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
if err := s.verifyEncryptedVolume(in.EncryptedVolume); err != nil {
log.Printf("error: %v", err)
return nil, status.Error(codes.InvalidArgument, err.Error())
}
resourceID := path.Base(in.EncryptedVolume.Name)
Expand All @@ -173,13 +155,11 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted
var result1 spdk.BdevCryptoDeleteResult
err1 := s.rpc.Call("bdev_crypto_delete", &params1, &result1)
if err1 != nil {
log.Printf("error: %v", err1)
return nil, err1
}
log.Printf("Received from SPDK: %v", result1)
if !result1 {
msg := fmt.Sprintf("Could not delete Crypto: %s", params1.Name)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
// now delete a key
Expand All @@ -189,26 +169,22 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted
var result0 spdk.AccelCryptoKeyDestroyResult
err0 := s.rpc.Call("accel_crypto_key_destroy", &params0, &result0)
if err0 != nil {
log.Printf("error: %v", err0)
return nil, err0
}
log.Printf("Received from SPDK: %v", result0)
if !result0 {
msg := fmt.Sprintf("Could not destroy Crypto Key: %v", params0.KeyName)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
params2 := s.getAccelCryptoKeyCreateParams(in.EncryptedVolume)
var result2 spdk.AccelCryptoKeyCreateResult
err2 := s.rpc.Call("accel_crypto_key_create", &params2, &result2)
if err2 != nil {
log.Printf("error: %v", err2)
return nil, err2
}
log.Printf("Received from SPDK: %v", result2)
if !result2 {
msg := fmt.Sprintf("Could not create Crypto Key: %s", string(in.EncryptedVolume.Key))
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
// create bdev now
Expand All @@ -220,13 +196,11 @@ func (s *Server) UpdateEncryptedVolume(_ context.Context, in *pb.UpdateEncrypted
var result3 spdk.BdevCryptoCreateResult
err3 := s.rpc.Call("bdev_crypto_create", &params3, &result3)
if err3 != nil {
log.Printf("error: %v", err3)
return nil, err3
}
log.Printf("Received from SPDK: %v", result3)
if result3 == "" {
msg := fmt.Sprintf("Could not create Crypto Dev: %s", params3.Name)
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
// return result
Expand All @@ -236,22 +210,18 @@ 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) {
log.Printf("ListEncryptedVolumes: Received from client: %v", in)
// check required fields
if err := fieldbehavior.ValidateRequiredFields(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
size, offset, perr := utils.ExtractPagination(in.PageSize, in.PageToken, s.Pagination)
if perr != nil {
log.Printf("error: %v", perr)
return nil, perr
}
var result []spdk.BdevGetBdevsResult
err := s.rpc.Call("bdev_get_bdevs", nil, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
Expand All @@ -274,17 +244,14 @@ 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) {
log.Printf("GetEncryptedVolume: Received from client: %v", in)
// check input correctness
if err := s.validateGetEncryptedVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
volume, ok := s.volumes.encVolumes[in.Name]
if !ok {
err := status.Errorf(codes.NotFound, "unable to find key %s", in.Name)
log.Printf("error: %v", err)
return nil, err
}
resourceID := path.Base(volume.Name)
Expand All @@ -294,31 +261,26 @@ func (s *Server) GetEncryptedVolume(_ context.Context, in *pb.GetEncryptedVolume
var result []spdk.BdevGetBdevsResult
err := s.rpc.Call("bdev_get_bdevs", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if len(result) != 1 {
msg := fmt.Sprintf("expecting exactly 1 result, got %d", len(result))
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
return &pb.EncryptedVolume{Name: result[0].Name}, nil
}

// StatsEncryptedVolume gets an encrypted volume stats
func (s *Server) StatsEncryptedVolume(_ context.Context, in *pb.StatsEncryptedVolumeRequest) (*pb.StatsEncryptedVolumeResponse, error) {
log.Printf("StatsEncryptedVolume: Received from client: %v", in)
// check input correctness
if err := s.validateStatsEncryptedVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
volume, ok := s.volumes.encVolumes[in.Name]
if !ok {
err := status.Errorf(codes.NotFound, "unable to find key %s", in.Name)
log.Printf("error: %v", err)
return nil, err
}
resourceID := path.Base(volume.Name)
Expand All @@ -329,13 +291,11 @@ func (s *Server) StatsEncryptedVolume(_ context.Context, in *pb.StatsEncryptedVo
var result spdk.BdevGetIostatResult
err := s.rpc.Call("bdev_get_iostat", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}
log.Printf("Received from SPDK: %v", result)
if len(result.Bdevs) != 1 {
msg := fmt.Sprintf("expecting exactly 1 result, got %d", len(result.Bdevs))
log.Print(msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
return &pb.StatsEncryptedVolumeResponse{Stats: &pb.VolumeStats{
Expand Down
23 changes: 1 addition & 22 deletions pkg/middleend/qos.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ func sortQosVolumes(volumes []*pb.QosVolume) {

// CreateQosVolume creates a QoS volume
func (s *Server) CreateQosVolume(_ context.Context, in *pb.CreateQosVolumeRequest) (*pb.QosVolume, error) {
log.Printf("CreateQosVolume: Received from client: %v", in)
// check input correctness
if err := s.validateCreateQosVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// see https://google.aip.dev/133#user-specified-ids
Expand All @@ -45,7 +43,6 @@ func (s *Server) CreateQosVolume(_ context.Context, in *pb.CreateQosVolumeReques
in.QosVolume.Name = utils.ResourceIDToVolumeName(resourceID)

if err := s.verifyQosVolume(in.QosVolume); err != nil {
log.Println("error:", err)
return nil, status.Error(codes.InvalidArgument, err.Error())
}
if volume, ok := s.volumes.qosVolumes[in.QosVolume.Name]; ok {
Expand All @@ -65,10 +62,8 @@ 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) {
log.Printf("DeleteQosVolume: Received from client: %v", in)
// check input correctness
if err := s.validateDeleteQosVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
Expand All @@ -78,7 +73,6 @@ func (s *Server) DeleteQosVolume(_ context.Context, in *pb.DeleteQosVolumeReques
return &emptypb.Empty{}, nil
}
err := status.Errorf(codes.NotFound, "unable to find key %s", in.Name)
log.Printf("error: %v", err)
return nil, err
}

Expand All @@ -92,15 +86,12 @@ 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) {
log.Printf("UpdateQosVolume: Received from client: %v", in)
// check input correctness
if err := s.validateUpdateQosVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
if err := s.verifyQosVolume(in.QosVolume); err != nil {
log.Println("error:", err)
return nil, status.Error(codes.InvalidArgument, err.Error())
}
name := in.QosVolume.Name
Expand All @@ -113,7 +104,6 @@ func (s *Server) UpdateQosVolume(_ context.Context, in *pb.UpdateQosVolumeReques
if volume.VolumeNameRef != in.QosVolume.VolumeNameRef {
msg := fmt.Sprintf("Change of underlying volume %v to a new one %v is forbidden",
volume.VolumeNameRef, in.QosVolume.VolumeNameRef)
log.Println("error:", msg)
return nil, status.Errorf(codes.InvalidArgument, msg)
}
log.Println("Set new max limit values")
Expand All @@ -127,16 +117,13 @@ 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) {
log.Printf("ListQosVolume: Received from client: %v", in)
// check required fields
if err := fieldbehavior.ValidateRequiredFields(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
size, offset, err := utils.ExtractPagination(in.PageSize, in.PageToken, s.Pagination)
if err != nil {
log.Printf("error: %v", err)
return nil, err
}

Expand All @@ -159,35 +146,29 @@ 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) {
log.Printf("GetQosVolume: Received from client: %v", in)
// check input correctness
if err := s.validateGetQosVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
volume, ok := s.volumes.qosVolumes[in.Name]
if !ok {
err := status.Errorf(codes.NotFound, "unable to find key %s", in.Name)
log.Printf("error: %v", err)
return nil, err
}
return volume, nil
}

// StatsQosVolume gets a QoS volume stats
func (s *Server) StatsQosVolume(_ context.Context, in *pb.StatsQosVolumeRequest) (*pb.StatsQosVolumeResponse, error) {
log.Printf("StatsQosVolume: Received from client: %v", in)
// check input correctness
if err := s.validateStatsQosVolumeRequest(in); err != nil {
log.Printf("error: %v", err)
return nil, err
}
// fetch object from the database
volume, ok := s.volumes.qosVolumes[in.Name]
if !ok {
err := status.Errorf(codes.NotFound, "unable to find key %s", in.Name)
log.Printf("error: %v", err)
return nil, err
}
params := spdk.BdevGetIostatParams{
Expand All @@ -196,7 +177,6 @@ func (s *Server) StatsQosVolume(_ context.Context, in *pb.StatsQosVolumeRequest)
var result spdk.BdevGetIostatResult
err := s.rpc.Call("bdev_get_iostat", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return nil, spdk.ErrFailedSpdkCall
}
log.Printf("Received from SPDK: %v", result)
Expand Down Expand Up @@ -230,13 +210,12 @@ func (s *Server) setMaxLimit(underlyingVolume string, limit *pb.QosLimit) error
var result spdk.BdevQoSResult
err := s.rpc.Call("bdev_set_qos_limit", &params, &result)
if err != nil {
log.Printf("error: %v", err)
return spdk.ErrFailedSpdkCall
}
log.Printf("Received from SPDK: %v", result)
if !result {
msg := fmt.Sprintf("Could not set max QoS limit: %s on %v", limit, underlyingVolume)
log.Print(msg)
log.Println(msg)
return spdk.ErrUnexpectedSpdkCallResult
}

Expand Down

0 comments on commit bd7b947

Please sign in to comment.