mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
<!-- CURSOR_AGENT_PR_BODY_BEGIN --> # Which Problems Are Solved After #12740, setup on existing deployments (v4.17.x → v4.18.0) fails before migration 78 can add `eventstore.unique_constraints.owners`. Starting any setup step pushes `system.migration.started`, which inserts a unique constraint that names the `owners` column. On upgraded databases that column does not exist yet, so setup dies on `76_users14_login_equality_indexes` with `SQLSTATE 42703`. # How the Problems Are Solved Empty-owner unique-constraint inserts no longer name the `owners` column: - `len(Owners) == 0` → `INSERT (instance_id, unique_type, unique_field)` - tagged `WithOwners(...)` → unchanged `INSERT (..., owners)` Setup started/done events never stamp owners, so 76–78 can start. Migration 78 still adds the column; after that, omitted `owners` uses `DEFAULT '{}'`. Both v2 and v3 pushers apply the same rule. Mixed pushes split into two INSERT batches so tagged and empty rows do not share a column list. # Additional Changes - v2 SQL mocks now expect the three-column INSERT for untagged adds, plus tagged and mixed cases - Pusher tests cover mixed tagged+empty adds and adds against a table that does not have `owners` yet - The missing-column pusher test drops `owners` and pushes in one transaction (`PushWithClient`), then rolls back so the shared test schema is not mutated. Other tests may stall on `AccessExclusiveLock` until rollback. # Additional Context - Closes #12780 - Follow-up for PR #12740 - Operators do not need to re-run init or apply DDL outside setup Verified locally: - `go test ./internal/eventstore ./internal/v2/eventstore/postgres ./internal/eventstore/v3` (including `-race` on those packages) - Empty-owner insert succeeds when the `owners` column is missing; tagged insert still requires the column <!-- CURSOR_AGENT_PR_BODY_END --> <div><a href="https://cursor.com/agents/bc-31bfb5c4-5888-43f0-85cf-af1af097ca30?cursor_ref=pr_footer&cursor_cta=open_in_web"><picture><source media="(prefers-color-scheme: dark)" srcset="https://cursor.com/assets/images/open-in-web-dark.png"><source media="(prefers-color-scheme: light)" srcset="https://cursor.com/assets/images/open-in-web-light.png"><img alt="Open in Web" width="114" height="28" src="https://cursor.com/assets/images/open-in-web-dark.png"></picture></a> <a href="https://cursor.com/background-agent?bcId=bc-31bfb5c4-5888-43f0-85cf-af1af097ca30&cursor_ref=pr_footer&cursor_cta=open_in_cursor"><picture><source media="(prefers-color-scheme: dark)" srcset="https://cursor.com/assets/images/open-in-cursor-dark.png"><source media="(prefers-color-scheme: light)" srcset="https://cursor.com/assets/images/open-in-cursor-light.png"><img alt="Open in Cursor" width="131" height="28" src="https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a> </div> --------- Co-authored-by: Cursor Agent <[email protected]> Co-authored-by: Silvan <[email protected]>
288 lines
8.5 KiB
Go
288 lines
8.5 KiB
Go
package postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"github.com/cockroachdb/cockroach-go/v2/crdb"
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/v2/database"
|
|
"github.com/zitadel/zitadel/internal/v2/eventstore"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
// Push implements eventstore.Pusher.
|
|
func (s *Storage) Push(ctx context.Context, intent *eventstore.PushIntent) (err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
tx := intent.Tx()
|
|
if tx == nil {
|
|
tx, err = s.client.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable, ReadOnly: false})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() {
|
|
err = database.CloseTx(tx, err)
|
|
}()
|
|
}
|
|
|
|
var retryCount uint32
|
|
return crdb.Execute(func() (err error) {
|
|
defer func() {
|
|
if err == nil {
|
|
return
|
|
}
|
|
if retryCount < s.config.MaxRetries {
|
|
retryCount++
|
|
return
|
|
}
|
|
logging.WithFields("retry_count", retryCount).WithError(err).Debug("max retry count reached")
|
|
err = zerrors.ThrowInternal(err, "POSTG-VJfJz", "Errors.Internal")
|
|
}()
|
|
// allows smaller wait times on query side for instances which are not actively writing
|
|
if err := setAppName(ctx, tx, "es_pusher_"+intent.Instance()); err != nil {
|
|
return err
|
|
}
|
|
|
|
intents, err := lockAggregates(ctx, tx, intent)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !checkSequences(intents) {
|
|
return zerrors.ThrowInvalidArgument(nil, "POSTG-KOM6E", "Errors.Internal.Eventstore.SequenceNotMatched")
|
|
}
|
|
|
|
commands := make([]*command, 0, len(intents))
|
|
for _, intent := range intents {
|
|
additionalCommands, err := intentToCommands(intent)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
commands = append(commands, additionalCommands...)
|
|
}
|
|
|
|
err = uniqueConstraints(ctx, tx, commands)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return s.push(ctx, tx, intent, commands)
|
|
})
|
|
}
|
|
|
|
// setAppName for the the current transaction
|
|
func setAppName(ctx context.Context, tx *sql.Tx, name string) error {
|
|
_, err := tx.ExecContext(ctx, fmt.Sprintf("SET LOCAL application_name TO '%s'", name))
|
|
if err != nil {
|
|
logging.WithFields("name", name).WithError(err).Debug("setting app name failed")
|
|
return zerrors.ThrowInternal(err, "POSTG-G3OmZ", "Errors.Internal")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func lockAggregates(ctx context.Context, tx *sql.Tx, intent *eventstore.PushIntent) (_ []*intent, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
var stmt database.Statement
|
|
|
|
stmt.WriteString("WITH existing AS (")
|
|
for i, aggregate := range intent.Aggregates() {
|
|
if i > 0 {
|
|
stmt.WriteString(" UNION ALL ")
|
|
}
|
|
stmt.WriteString(`(SELECT instance_id, aggregate_type, aggregate_id, "sequence" FROM eventstore.events2 WHERE instance_id = `)
|
|
stmt.WriteArgs(intent.Instance())
|
|
stmt.WriteString(` AND aggregate_type = `)
|
|
stmt.WriteArgs(aggregate.Type())
|
|
stmt.WriteString(` AND aggregate_id = `)
|
|
stmt.WriteArgs(aggregate.ID())
|
|
stmt.WriteString(` AND owner = `)
|
|
stmt.WriteArgs(aggregate.Owner())
|
|
stmt.WriteString(` ORDER BY "sequence" DESC LIMIT 1)`)
|
|
}
|
|
stmt.WriteString(") SELECT e.instance_id, e.owner, e.aggregate_type, e.aggregate_id, e.sequence FROM eventstore.events2 e JOIN existing ON e.instance_id = existing.instance_id AND e.aggregate_type = existing.aggregate_type AND e.aggregate_id = existing.aggregate_id AND e.sequence = existing.sequence FOR UPDATE")
|
|
|
|
//nolint:rowserrcheck
|
|
// rows is checked by database.MapRowsToObject
|
|
rows, err := tx.QueryContext(ctx, stmt.String(), stmt.Args()...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
res := makeIntents(intent)
|
|
|
|
err = database.MapRowsToObject(rows, func(scan func(dest ...any) error) error {
|
|
var sequence sql.Null[uint32]
|
|
agg := new(eventstore.Aggregate)
|
|
|
|
err := scan(
|
|
&agg.Instance,
|
|
&agg.Owner,
|
|
&agg.Type,
|
|
&agg.ID,
|
|
&sequence,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
intentByAggregate(res, agg).sequence = sequence.V
|
|
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return res, nil
|
|
}
|
|
|
|
func (s *Storage) push(ctx context.Context, tx *sql.Tx, reducer eventstore.Reducer, commands []*command) (err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
var stmt database.Statement
|
|
|
|
stmt.WriteString(`INSERT INTO eventstore.events2 (instance_id, "owner", aggregate_type, aggregate_id, revision, creator, event_type, payload, "sequence", in_tx_order, created_at, "position") VALUES `)
|
|
for i, cmd := range commands {
|
|
if i > 0 {
|
|
stmt.WriteString(", ")
|
|
}
|
|
|
|
cmd.position.InPositionOrder = uint32(i)
|
|
stmt.WriteString(`(`)
|
|
stmt.WriteArgs(
|
|
cmd.intent.Aggregate().Instance,
|
|
cmd.intent.Aggregate().Owner,
|
|
cmd.intent.Aggregate().Type,
|
|
cmd.intent.Aggregate().ID,
|
|
cmd.Revision,
|
|
cmd.Creator,
|
|
cmd.Type,
|
|
cmd.payload,
|
|
cmd.sequence,
|
|
cmd.position.InPositionOrder,
|
|
)
|
|
|
|
stmt.WriteString(", statement_timestamp(), EXTRACT(EPOCH FROM clock_timestamp()))")
|
|
}
|
|
stmt.WriteString(` RETURNING created_at, "position"`)
|
|
|
|
//nolint:rowserrcheck
|
|
// rows is checked by database.MapRowsToObject
|
|
rows, err := tx.QueryContext(ctx, stmt.String(), stmt.Args()...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var i int
|
|
return database.MapRowsToObject(rows, func(scan func(dest ...any) error) error {
|
|
defer func() { i++ }()
|
|
|
|
err := scan(
|
|
&commands[i].createdAt,
|
|
&commands[i].position.Position,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return reducer.Reduce(commands[i].toEvent())
|
|
})
|
|
}
|
|
|
|
func uniqueConstraints(ctx context.Context, tx *sql.Tx, commands []*command) (err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
var stmt database.Statement
|
|
|
|
for _, cmd := range commands {
|
|
if len(cmd.UniqueConstraints) == 0 {
|
|
continue
|
|
}
|
|
for _, constraint := range cmd.UniqueConstraints {
|
|
stmt.Reset()
|
|
|
|
instance := cmd.intent.PushAggregate.Aggregate().Instance
|
|
if constraint.IsGlobal {
|
|
instance = ""
|
|
}
|
|
switch constraint.Action {
|
|
case eventstore.UniqueConstraintAdd:
|
|
if len(constraint.Owners) == 0 {
|
|
stmt.WriteString(`INSERT INTO eventstore.unique_constraints (instance_id, unique_type, unique_field) VALUES (`)
|
|
stmt.WriteArg(instance)
|
|
stmt.WriteString(`, `)
|
|
stmt.WriteArg(constraint.UniqueType)
|
|
stmt.WriteString(`, `)
|
|
stmt.WriteArg(constraint.UniqueField)
|
|
stmt.WriteString(`)`)
|
|
} else {
|
|
stmt.WriteString(`INSERT INTO eventstore.unique_constraints (instance_id, unique_type, unique_field, owners) VALUES (`)
|
|
stmt.WriteArg(instance)
|
|
stmt.WriteString(`, `)
|
|
stmt.WriteArg(constraint.UniqueType)
|
|
stmt.WriteString(`, `)
|
|
stmt.WriteArg(constraint.UniqueField)
|
|
stmt.WriteString(`, `)
|
|
stmt.WriteArg(constraint.Owners)
|
|
stmt.WriteString(`)`)
|
|
}
|
|
case eventstore.UniqueConstraintInstanceRemove:
|
|
stmt.WriteString(`DELETE FROM eventstore.unique_constraints WHERE instance_id = `)
|
|
stmt.WriteArgs(instance)
|
|
case eventstore.UniqueConstraintRemove:
|
|
stmt.WriteString(`DELETE FROM eventstore.unique_constraints WHERE `)
|
|
stmt.WriteString(deleteUniqueConstraintClause)
|
|
stmt.AppendArgs(
|
|
instance,
|
|
constraint.UniqueType,
|
|
constraint.UniqueField,
|
|
)
|
|
case eventstore.UniqueConstraintRemoveByOwner:
|
|
if len(constraint.Owners) == 0 {
|
|
continue
|
|
}
|
|
stmt.WriteString(`DELETE FROM eventstore.unique_constraints WHERE instance_id = `)
|
|
stmt.WriteArgs(instance)
|
|
stmt.WriteString(` AND owners @> ARRAY[`)
|
|
stmt.WriteArgs(constraint.Owners[0])
|
|
stmt.WriteString(`]::text[]`)
|
|
}
|
|
_, err := tx.ExecContext(ctx, stmt.String(), stmt.Args()...)
|
|
if err != nil {
|
|
logging.WithFields("action", constraint.Action).Warn("handling of unique constraint failed")
|
|
errMessage := constraint.ErrorMessage
|
|
if errMessage == "" {
|
|
errMessage = "Errors.Internal"
|
|
}
|
|
return zerrors.ThrowAlreadyExists(err, "POSTG-QzjyP", errMessage)
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// the query is so complex because we accidentally stored unique constraint case-sensitive
|
|
// the query checks first if there is a case-sensitive match and afterward if there is a case-insensitive match
|
|
var deleteUniqueConstraintClause = `
|
|
(instance_id = $1 AND unique_type = $2 AND unique_field = (
|
|
SELECT unique_field from (
|
|
SELECT instance_id, unique_type, unique_field
|
|
FROM eventstore.unique_constraints
|
|
WHERE instance_id = $1 AND unique_type = $2 AND unique_field = $3
|
|
UNION ALL
|
|
SELECT instance_id, unique_type, unique_field
|
|
FROM eventstore.unique_constraints
|
|
WHERE instance_id = $1 AND unique_type = $2 AND unique_field = LOWER($3)
|
|
) AS case_insensitive_constraints LIMIT 1)
|
|
)`
|