Skip to content

Commit c63bb7c

Browse files
authored
Fix redis transaction registry (#184)
* fix(redis_transaction_registry): decouple from keepTTL marker in set command, available only from version > 6.x * fix: failing test kill_query
1 parent f4a34c3 commit c63bb7c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cache/transaction_registry_redis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (r *redisTransactionRegistry) Fail(key *Key) error {
3737
}
3838

3939
func (r *redisTransactionRegistry) updateTransactionState(key *Key, state TransactionState) error {
40-
return r.redisClient.Set(context.Background(), toTransactionKey(key), uint64(state), redis.KeepTTL).Err()
40+
return r.redisClient.Set(context.Background(), toTransactionKey(key), uint64(state), r.deadline).Err()
4141
}
4242

4343
func (r *redisTransactionRegistry) Status(key *Key) (TransactionState, error) {

proxy_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,14 +467,14 @@ func TestKillQuery(t *testing.T) {
467467
name: "timeout user",
468468
f: func(p *reverseProxy) *http.Response {
469469
p.users["default"].maxExecutionTime = time.Millisecond * 10
470-
return makeHeavyRequest(p, time.Millisecond*20)
470+
return makeHeavyRequest(p, time.Millisecond*40)
471471
},
472472
},
473473
{
474474
name: "timeout cluster user",
475475
f: func(p *reverseProxy) *http.Response {
476476
p.clusters["cluster"].users["web"].maxExecutionTime = time.Millisecond * 10
477-
return makeHeavyRequest(p, time.Millisecond*20)
477+
return makeHeavyRequest(p, time.Millisecond*40)
478478
},
479479
},
480480
}
@@ -492,7 +492,7 @@ func TestKillQuery(t *testing.T) {
492492
t.Fatalf("expected Id to be extracted from %q", b)
493493
}
494494

495-
time.Sleep(time.Millisecond * 30)
495+
time.Sleep(time.Millisecond * 50)
496496
state, err := registry.get(id)
497497
if err != nil {
498498
t.Fatalf("unexpected requestRegistry err for key %q: %s", id, err)

0 commit comments

Comments
 (0)