From 741bd66ebf7b65aedd858b7033d4fc6a4bc0262c Mon Sep 17 00:00:00 2001 From: Pawel Gontarz Date: Thu, 7 Jul 2022 12:04:02 +0200 Subject: [PATCH 1/2] fix(redis_transaction_registry): decouple from keepTTL marker in set command, available only from version > 6.x --- cache/transaction_registry_redis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/transaction_registry_redis.go b/cache/transaction_registry_redis.go index 0e6f0d8c..ba127614 100644 --- a/cache/transaction_registry_redis.go +++ b/cache/transaction_registry_redis.go @@ -37,7 +37,7 @@ func (r *redisTransactionRegistry) Fail(key *Key) error { } func (r *redisTransactionRegistry) updateTransactionState(key *Key, state TransactionState) error { - return r.redisClient.Set(context.Background(), toTransactionKey(key), uint64(state), redis.KeepTTL).Err() + return r.redisClient.Set(context.Background(), toTransactionKey(key), uint64(state), r.deadline).Err() } func (r *redisTransactionRegistry) Status(key *Key) (TransactionState, error) { From 21b7b10f13f417db687aaa35b069b2164a66f1da Mon Sep 17 00:00:00 2001 From: Pawel Gontarz Date: Thu, 7 Jul 2022 13:39:35 +0200 Subject: [PATCH 2/2] fix: failing test kill query test --- proxy_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy_test.go b/proxy_test.go index b4701c62..69b89a2c 100644 --- a/proxy_test.go +++ b/proxy_test.go @@ -467,14 +467,14 @@ func TestKillQuery(t *testing.T) { name: "timeout user", f: func(p *reverseProxy) *http.Response { p.users["default"].maxExecutionTime = time.Millisecond * 10 - return makeHeavyRequest(p, time.Millisecond*20) + return makeHeavyRequest(p, time.Millisecond*40) }, }, { name: "timeout cluster user", f: func(p *reverseProxy) *http.Response { p.clusters["cluster"].users["web"].maxExecutionTime = time.Millisecond * 10 - return makeHeavyRequest(p, time.Millisecond*20) + return makeHeavyRequest(p, time.Millisecond*40) }, }, } @@ -492,7 +492,7 @@ func TestKillQuery(t *testing.T) { t.Fatalf("expected Id to be extracted from %q", b) } - time.Sleep(time.Millisecond * 30) + time.Sleep(time.Millisecond * 50) state, err := registry.get(id) if err != nil { t.Fatalf("unexpected requestRegistry err for key %q: %s", id, err)