Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions internal/statestore/backfill_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
)

func TestCreateBackfillLastAckTime(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand All @@ -56,7 +56,7 @@ func TestCreateBackfillLastAckTime(t *testing.T) {
}

func TestCreateBackfill(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -118,7 +118,7 @@ func TestCreateBackfill(t *testing.T) {
}

func TestUpdateExistingBackfillNoError(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -178,7 +178,7 @@ func TestUpdateExistingBackfillNoError(t *testing.T) {
}

func TestUpdateBackfillDoNotExistCanNotUpdate(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -208,7 +208,7 @@ func TestUpdateBackfillDoNotExistCanNotUpdate(t *testing.T) {
}

func TestUpdateBackfillExpiredBackfillErrExpected(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -236,7 +236,7 @@ func TestUpdateBackfillExpiredBackfillErrExpected(t *testing.T) {
}

func TestUpdateBackfillExpiredContextErrExpected(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand All @@ -254,7 +254,7 @@ func TestUpdateBackfillExpiredContextErrExpected(t *testing.T) {
}

func TestGetBackfill(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -341,7 +341,7 @@ func TestGetBackfill(t *testing.T) {
}

func TestDeleteBackfill(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -424,7 +424,7 @@ func TestDeleteBackfill(t *testing.T) {
// TestUpdateAcknowledgmentTimestampLifecycle test statestore functions - UpdateAcknowledgmentTimestamp, GetExpiredBackfillIDs
// and deleteExpiredBackfillID
func TestUpdateAcknowledgmentTimestampLifecycle(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()

service := New(cfg)
Expand Down Expand Up @@ -480,7 +480,7 @@ func TestUpdateAcknowledgmentTimestampLifecycle(t *testing.T) {
}

func TestUpdateAcknowledgmentTimestamp(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()

startTime := time.Now()
Expand Down Expand Up @@ -511,7 +511,7 @@ func TestUpdateAcknowledgmentTimestamp(t *testing.T) {
}

func TestUpdateAcknowledgmentTimestamptExpiredBackfillErrExpected(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand All @@ -535,7 +535,7 @@ func TestUpdateAcknowledgmentTimestamptExpiredBackfillErrExpected(t *testing.T)
}

func TestUpdateAcknowledgmentTimestampConnectionError(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand All @@ -560,7 +560,7 @@ func createInvalidRedisConfig() config.View {
// TestGetExpiredBackfillIDs test statestore function GetExpiredBackfillIDs
func TestGetExpiredBackfillIDs(t *testing.T) {
// Prepare expired and normal BackfillIds in a Redis Sorted Set
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()

expID := "expired"
Expand All @@ -584,7 +584,7 @@ func TestGetExpiredBackfillIDs(t *testing.T) {
}

func TestIndexBackfill(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -617,7 +617,7 @@ func TestIndexBackfill(t *testing.T) {
}

func TestDeindexBackfill(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -654,7 +654,7 @@ func TestDeindexBackfill(t *testing.T) {
}

func TestGetIndexedBackfills(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -705,7 +705,7 @@ func generateBackfills(ctx context.Context, t *testing.T, service Service, amoun

func BenchmarkCleanupBackfills(b *testing.B) {
t := &testing.T{}
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down Expand Up @@ -743,7 +743,7 @@ func BenchmarkCleanupBackfills(b *testing.B) {
}

func TestCleanupBackfills(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down
2 changes: 1 addition & 1 deletion internal/statestore/redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

func TestNewMutex(t *testing.T) {
cfg, closer := createRedis(t, false, "")
cfg, closer, _ := createRedis(t, false, "")
defer closer()
service := New(cfg)
require.NotNil(t, service)
Expand Down
18 changes: 17 additions & 1 deletion internal/statestore/ticket.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ func (rb *redisBackend) CreateTicket(ctx context.Context, ticket *pb.Ticket) err
return status.Errorf(codes.Internal, "failed to marshal the ticket proto, id: %s: proto: Marshal called with nil", ticket.GetId())
}

_, err = redisConn.Do("SET", ticket.GetId(), value)
ticketDeletionTTL := getTicketDeleteTimeout(rb.cfg) / time.Millisecond
_, err = redisConn.Do("SET", ticket.GetId(), value, "PX", int64(ticketDeletionTTL))
if err != nil {
err = errors.Wrapf(err, "failed to set the value for ticket, id: %s", ticket.GetId())
return status.Errorf(codes.Internal, "%v", err)
Expand Down Expand Up @@ -533,3 +534,18 @@ func getAssignedDeleteTimeout(cfg config.View) time.Duration {

return cfg.GetDuration(name)
}

func getTicketDeleteTimeout(cfg config.View) time.Duration {
const (
name = "ticketDeleteTimeout"
// Default timeout to delete tickets after creation. This value
// will be used if ticketDeleteTimeout is not configured.
defaultTicketDeleteTimeout = 1 * time.Hour
)

if !cfg.IsSet(name) {
return defaultTicketDeleteTimeout
}

return cfg.GetDuration(name)
}
Loading