TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-04 23:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(crdb): obtain latest sequences when the tx is retried (#7795)

Browse Source
This commit is contained in:
Tim Möhlmann 2024-04-18 16:07:05 +03:00 committed by GitHub
parent d337668599
commit 029a6d393a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/command/command.go
View File

@ -296,7 +296,7 @@ func (c *Commands) asyncPush(ctx context.Context, cmds ...eventstore.Command) {
_, err := c.eventstore.Push(localCtx, cmds...) _, err := c.eventstore.Push(localCtx, cmds...)
if err != nil { if err != nil {
for _, cmd := range cmds { for _, cmd := range cmds {
logging.WithError(err).Errorf("could not push event %q", cmd.Type()) logging.WithError(err).Warnf("could not push event %q", cmd.Type())
} }
} }

4
internal/eventstore/eventstore_pusher_test.go
View File

@ -390,10 +390,10 @@ func TestCRDB_Push_Parallel(t *testing.T) {
}, },
}, },
res: res{ res: res{
minErrCount: 1, minErrCount: 0,
eventsRes: eventsRes{ eventsRes: eventsRes{
aggIDs: []string{"204"}, aggIDs: []string{"204"},
pushedEventsCount: 6, pushedEventsCount: 8,
aggTypes: database.TextArray[eventstore.AggregateType]{eventstore.AggregateType(t.Name())}, aggTypes: database.TextArray[eventstore.AggregateType]{eventstore.AggregateType(t.Name())},
}, },
}, },

6
internal/eventstore/v3/push.go
View File

@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"strings" "strings"
"sync"
"github.com/cockroachdb/cockroach-go/v2/crdb" "github.com/cockroachdb/cockroach-go/v2/crdb"
"github.com/jackc/pgx/v5/pgconn" "github.com/jackc/pgx/v5/pgconn"
@ -29,13 +28,10 @@ func (es *Eventstore) Push(ctx context.Context, commands ...eventstore.Command)
// tx is not closed because [crdb.ExecuteInTx] takes care of that // tx is not closed because [crdb.ExecuteInTx] takes care of that
var ( var (
sequences []*latestSequence sequences []*latestSequence
once sync.Once
) )
err = crdb.ExecuteInTx(ctx, &transaction{tx}, func() error { err = crdb.ExecuteInTx(ctx, &transaction{tx}, func() error {
once.Do(func() { sequences, err = latestSequences(ctx, tx, commands)
sequences, err = latestSequences(ctx, tx, commands)
})
if err != nil { if err != nil {
return err return err
} }