TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(db): always use begin tx (#7142)

Browse Source 
* fix(db): always use begin tx

* fix(handler): timeout for begin
This commit is contained in:
Silvan
2024-01-04 17:12:20 +01:00
committed by GitHub
parent c0cef4983a
commit b7d027e2fd
19 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/eventstore/handler/v2/handler.go
View File

@@ -316,13 +316,17 @@ func (h *Handler) processEvents(ctx context.Context, config *triggerConfig) (add
}
}()
txCtx := ctx
if h.txDuration > 0 {
var cancel func()
ctx, cancel = context.WithTimeout(ctx, h.txDuration)
defer cancel()
// add 100ms to store current state if iteration takes too long
txCtx, cancel = context.WithTimeout(ctx, h.txDuration+100*time.Millisecond)
defer cancel()
}
tx, err := h.client.Begin()
tx, err := h.client.BeginTx(txCtx, nil)
if err != nil {
return false, err
}

6
internal/eventstore/handler/v2/state_test.go
View File

@@ -121,7 +121,7 @@ func TestHandler_lockState(t *testing.T) {
projection: tt.fields.projection,
}
tx, err := tt.fields.mock.DB.Begin()
tx, err := tt.fields.mock.DB.BeginTx(context.Background(), nil)
if err != nil {
t.Fatalf("unable to begin transaction: %v", err)
}
@@ -244,7 +244,7 @@ func TestHandler_updateLastUpdated(t *testing.T) {
}
}
t.Run(tt.name, func(t *testing.T) {
tx, err := tt.fields.mock.DB.Begin()
tx, err := tt.fields.mock.DB.BeginTx(context.Background(), nil)
if err != nil {
t.Fatalf("unable to begin transaction: %v", err)
}
@@ -433,7 +433,7 @@ func TestHandler_currentState(t *testing.T) {
projection: tt.fields.projection,
}
tx, err := tt.fields.mock.DB.Begin()
tx, err := tt.fields.mock.DB.BeginTx(context.Background(), nil)
if err != nil {
t.Fatalf("unable to begin transaction: %v", err)
}