Skip to content

Fix redis transaction registry #184

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

Merged
gontarzpawel merged 2 commits into from
Jul 7, 2022
Merged

Fix redis transaction registry #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
741bd66
fix(redis_transaction_registry): decouple from keepTTL marker in set …
gontarzpawel Jul 7, 2022
21b7b10
fix: failing test kill query test
gontarzpawel Jul 7, 2022
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
2 changes: 1 addition & 1 deletion cache/transaction_registry_redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
},
}
Expand All @@ -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)
Expand Down