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
Bulk unique-constraint deletes (org, IDP with many links, user, project)
reconstruct every uniqueness key in Go and emit N `DELETE`s. That can
OOM on large tenants.
A one-shot owner backfill is also not enough: during a rolling deploy,
older binaries still insert `owners = '{}'`, so a later owner-only
delete would miss those rows.
Owner-only org/user/grant delete only matches rows whose `owners` bag
contains that tag. Several grant and member types stamped the aggregate
resource owner, which is not always the user’s home org or the granted
org. Username-scope rewrites also dropped `user:` tags, so owner-only
user delete could miss rewritten username rows.
Command must not switch to owner-only delete on the first 79 of a
version, because leftover `'{}'` rows from rolling-update overlap are
only backfilled on a later 79. A failed 79 must not turn owner-delete
on, and backfill joins must not stamp the wrong org (unverified domains,
org-scoped usernames colliding with instance-scoped ones).
# How the Problems Are Solved
Uniqueness stays the existing primary key `(instance_id, unique_type,
unique_field)`. `owners` is only a lifecycle bag of tags (`org:<id>`,
`user:<id>`, `idp:<id>`, `project:<id>`, `grant:<id>`).
- Add `owners TEXT[] NOT NULL DEFAULT '{}'` on
`eventstore.unique_constraints` (init SQL for greenfield, setup 78 for
existing clusters).
- Create `unique_constraints_owners_gin` with `CREATE INDEX
CONCURRENTLY` **outside a transaction** (same pattern as step 76).
Built-in `GIN (owners)` only; no `btree_gin`.
- Stamp `WithOwners` on **add** events. Field-level removes ignore
owners. `RemoveByOwner` stores the tag in `Owners` and both v1/v3 and v2
pushers run `DELETE … WHERE instance_id = $1 AND owners @>
ARRAY[$tag]::text[]`.
- Setup 79 backfills `owners` from projections via numbered
`cmd/setup/79/*.sql` files. Table names are interpolated from
`internal/query/projection` constants. Matches use `unique_field IN (x,
lower(x))` so the primary key can be used. Missing projection tables
(`42P01`) are skipped.
- Org domains are tagged only when `is_verified`. Instance-scoped
usernames join only users that are not org-scoped (organization settings
or domain policy `user_login_must_be_domain`). Every username row still
gets `org:` + `user:` of that user.
- 79 is a **repeatable** migration. `Check` re-runs when
`lastRun["version"]` changed or when setup-only `ForceFinalize` is set
and `lastRun["finalized"]` is still false. `Finalized` is written only
after Execute succeeds.
- Failed setup events keep the last successful `lastRun`. Command reads
`finalized` only from `system.migration.repeatable.done`.
- Org / user / project remove skip N-key event replay **when that
`finalized` bit is true**. Otherwise they keep today’s N-key lists
**and** still emit `RemoveByOwner`. The “ready” result is cached in
memory once true.
Setup writes `finalized` on the 79 repeatable.done payload:
- First 79 of a version: backfill only, `finalized=false` (unless
`ForceFinalize` is already set).
- Later 79: version change or
`BackfillUniqueConstraintOwners.ForceFinalize` /
`ZITADEL_BACKFILLUNIQUECONSTRAINTOWNERS_FORCEFINALIZE` after the rolling
update is done. That run backfills leftovers and writes
`finalized=true`.
Member and grant owner bags now include every org that should delete the
row:
- Instance, org, and project members also stamp
`org:<user_resource_owner>`.
- User grants stamp grant, user, project, and granted orgs.
- Project grant members stamp the project org, user org, and granted
org.
- Project grants stamp both orgs plus `grant:<id>`. Grant remove emits
`RemoveByOwner(grant)`.
- Username-scope rewrites keep `user:<id>` as well as `org:`.
- User/grant orgs are carried as unexported add-event fields (not
persisted JSON). `WithOwners` skips empty and duplicate tags.
# Additional Changes
- Table-driven owner-tag tests, including project grant (two `org:` tags
plus `grant:`), cross-org members, user grants, and username-scope
rewrite `user:` tags.
- Table-driven 79 `Check` + `finalizeAfterSuccess` tests for version
change, sequential version bumps, ForceFinalize restart, and
already-finalized skip.
- Command tests: a failed 79 event with `finalized=true` does not enable
owner-delete.
- Integration fixtures (verified vs unverified org domain;
instance-scoped `bob` vs org-scoped `bob`).
- Instance-only and global unique types stay untagged (`'{}'`). Instance
wipe still uses `UniqueConstraintInstanceRemove`.
- Pusher owner cases live in `eventstore_pusher_owners_test.go` so
`eventstore_pusher_test.go` stays under 1k lines.
# Additional Context
A later cleanup can delete the N-key replay helpers once a release that
ran 79 a second time (or an operator who set `ForceFinalize`) is in
production. That is not required for correctness.
<!-- CURSOR_AGENT_PR_BODY_END -->
<div><a
href="https://cursor.com/agents/bc-44f9bc9b-9a93-4cd9-8dd1-663a7b9aad2a?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-44f9bc9b-9a93-4cd9-8dd1-663a7b9aad2a&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]>
278 lines
8.2 KiB
Go
278 lines
8.2 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:
|
|
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)
|
|
)`
|