Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved tests for statestore - redis #1264

Merged
merged 6 commits into from
Oct 13, 2020
Merged

Improved tests for statestore - redis #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e1bcd1
Added healthcheck and createTicket tests
alexey-kremsa-globant Sep 12, 2020
332e715
added GetTicket unit tests
alexey-kremsa-globant Sep 13, 2020
d00c063
added tests for DeleteTicket, IndexTicket and DeindexTicket
alexey-kremsa-globant Sep 14, 2020
089b208
added TestGetIndexedIDSet, TestGetTickets
alexey-kremsa-globant Sep 22, 2020
4486d77
added release tickets tests
alexey-kremsa-globant Sep 22, 2020
a78e81e
assignments tests
alexey-kremsa-globant Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 17 additions & 14 deletions internal/statestore/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ import (
"open-match.dev/open-match/pkg/pb"
)

const allTickets = "allTickets"
const (
allTickets = "allTickets"
proposedTicketIDs = "proposed_ticket_ids"
)

var (
redisLogger = logrus.WithFields(logrus.Fields{
Expand Down Expand Up @@ -255,7 +258,7 @@ func (rb *redisBackend) GetTicket(ctx context.Context, id string) (*pb.Ticket, e
if err != nil {
// Return NotFound if redigo did not find the ticket in storage.
if err == redis.ErrNil {
msg := fmt.Sprintf("Ticket id:%s not found", id)
msg := fmt.Sprintf("Ticket id: %s not found", id)
return nil, status.Error(codes.NotFound, msg)
}

Expand All @@ -264,7 +267,7 @@ func (rb *redisBackend) GetTicket(ctx context.Context, id string) (*pb.Ticket, e
}

if value == nil {
msg := fmt.Sprintf("Ticket id:%s not found", id)
msg := fmt.Sprintf("Ticket id: %s not found", id)
return nil, status.Error(codes.NotFound, msg)
}

Expand Down Expand Up @@ -343,7 +346,7 @@ func (rb *redisBackend) GetIndexedIDSet(ctx context.Context) (map[string]struct{
startTimeInt := curTime.Add(-ttl).UnixNano()

// Filter out tickets that are fetched but not assigned within ttl time (ms).
idsInPendingReleases, err := redis.Strings(redisConn.Do("ZRANGEBYSCORE", "proposed_ticket_ids", startTimeInt, endTimeInt))
idsInPendingReleases, err := redis.Strings(redisConn.Do("ZRANGEBYSCORE", proposedTicketIDs, startTimeInt, endTimeInt))
if err != nil {
return nil, status.Errorf(codes.Internal, "error getting pending release %v", err)
}
Expand Down Expand Up @@ -413,6 +416,12 @@ func (rb *redisBackend) UpdateAssignments(ctx context.Context, req *pb.AssignTic
return resp, []*pb.Ticket{}, nil
}

redisConn, err := rb.redisPool.GetContext(ctx)
if err != nil {
return nil, nil, status.Errorf(codes.Unavailable, "UpdateAssignments, failed to connect to redis: %v", err)
}
defer handleConnectionClose(&redisConn)

idToA := make(map[string]*pb.Assignment)
ids := make([]string, 0)
idsI := make([]interface{}, 0)
Expand All @@ -423,7 +432,7 @@ func (rb *redisBackend) UpdateAssignments(ctx context.Context, req *pb.AssignTic

for _, id := range a.TicketIds {
if _, ok := idToA[id]; ok {
return nil, nil, status.Errorf(codes.InvalidArgument, "Ticket id %s is assigned multiple times in one assign tickets call.", id)
return nil, nil, status.Errorf(codes.InvalidArgument, "Ticket id %s is assigned multiple times in one assign tickets call", id)
}

idToA[id] = a.Assignment
Expand All @@ -432,12 +441,6 @@ func (rb *redisBackend) UpdateAssignments(ctx context.Context, req *pb.AssignTic
}
}

redisConn, err := rb.redisPool.GetContext(ctx)
if err != nil {
return nil, nil, status.Errorf(codes.Unavailable, "UpdateAssignments, failed to connect to redis: %v", err)
}
defer handleConnectionClose(&redisConn)

ticketBytes, err := redis.ByteSlices(redisConn.Do("MGET", idsI...))
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -557,7 +560,7 @@ func (rb *redisBackend) AddTicketsToPendingRelease(ctx context.Context, ids []st

currentTime := time.Now().UnixNano()
cmds := make([]interface{}, 0, 2*len(ids)+1)
cmds = append(cmds, "proposed_ticket_ids")
cmds = append(cmds, proposedTicketIDs)
for _, id := range ids {
cmds = append(cmds, currentTime, id)
}
Expand All @@ -584,7 +587,7 @@ func (rb *redisBackend) DeleteTicketsFromPendingRelease(ctx context.Context, ids
defer handleConnectionClose(&redisConn)

cmds := make([]interface{}, 0, len(ids)+1)
cmds = append(cmds, "proposed_ticket_ids")
cmds = append(cmds, proposedTicketIDs)
for _, id := range ids {
cmds = append(cmds, id)
}
Expand All @@ -605,7 +608,7 @@ func (rb *redisBackend) ReleaseAllTickets(ctx context.Context) error {
}
defer handleConnectionClose(&redisConn)

_, err = redisConn.Do("DEL", "proposed_ticket_ids")
_, err = redisConn.Do("DEL", proposedTicketIDs)
return err
}

Expand Down