TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-06-27 17:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(setup): smaller transactions (#5742)

Browse Source
This commit is contained in:
Silvan 2023-04-25 10:12:53 +02:00 committed by GitHub
parent 095ec21678
commit 13f6b4686a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/setup/10.go
View File

@ -2,8 +2,11 @@ package setup
import ( import (
"context" "context"
"database/sql"
_ "embed" _ "embed"
"time"
"github.com/cockroachdb/cockroach-go/v2/crdb"
"github.com/zitadel/logging" "github.com/zitadel/logging"
"github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/database"
@ -16,34 +19,31 @@ var (
type CorrectCreationDate struct { type CorrectCreationDate struct {
dbClient *database.DB dbClient *database.DB
FailAfter time.Duration
} }
func (mig *CorrectCreationDate) Execute(ctx context.Context) (err error) { func (mig *CorrectCreationDate) Execute(ctx context.Context) (err error) {
tx, err := mig.dbClient.Begin() ctx, cancel := context.WithTimeout(ctx, mig.FailAfter)
if err != nil { defer cancel()
return err
} for {
var affected int64
err = crdb.ExecuteTx(ctx, mig.dbClient.DB, nil, func(tx *sql.Tx) error {
if mig.dbClient.Type() == "cockroach" { if mig.dbClient.Type() == "cockroach" {
if _, err := tx.Exec("SET experimental_enable_temp_tables=on"); err != nil { if _, err := tx.Exec("SET experimental_enable_temp_tables=on"); err != nil {
return err return err
} }
} }
defer func() {
if err != nil {
logging.OnError(tx.Rollback()).Debug("rollback failed")
return
}
err = tx.Commit()
}()
for {
res, err := tx.ExecContext(ctx, correctCreationDate10) res, err := tx.ExecContext(ctx, correctCreationDate10)
if err != nil { if err != nil {
return err return err
} }
affected, _ := res.RowsAffected() affected, _ = res.RowsAffected()
logging.WithFields("count", affected).Info("creation dates changed") logging.WithFields("count", affected).Info("creation dates changed")
if affected == 0 {
return nil return nil
})
if affected == 0 || err != nil {
return err
} }
} }
} }

2
cmd/setup/10.sql
View File

@ -5,8 +5,6 @@ CREATE temporary TABLE IF NOT EXISTS wrong_events (
, next_cd TIMESTAMPTZ , next_cd TIMESTAMPTZ
); );
TRUNCATE wrong_events;
INSERT INTO wrong_events ( INSERT INTO wrong_events (
SELECT * FROM ( SELECT * FROM (
SELECT SELECT

2
cmd/setup/config.go
View File

@ -65,7 +65,7 @@ type Steps struct {
s7LogstoreTables *LogstoreTables s7LogstoreTables *LogstoreTables
s8AuthTokens *AuthTokenIndexes s8AuthTokens *AuthTokenIndexes
s9EventstoreIndexes2 *EventstoreIndexesNew s9EventstoreIndexes2 *EventstoreIndexesNew
s10EventstoreCreationDate *CorrectCreationDate CorrectCreationDate *CorrectCreationDate
} }
type encryptionKeyConfig struct { type encryptionKeyConfig struct {

4
cmd/setup/setup.go
View File

@ -88,7 +88,7 @@ func Setup(config *Config, steps *Steps, masterKey string) {
steps.s7LogstoreTables = &LogstoreTables{dbClient: dbClient.DB, username: config.Database.Username(), dbType: config.Database.Type()} steps.s7LogstoreTables = &LogstoreTables{dbClient: dbClient.DB, username: config.Database.Username(), dbType: config.Database.Type()}
steps.s8AuthTokens = &AuthTokenIndexes{dbClient: dbClient} steps.s8AuthTokens = &AuthTokenIndexes{dbClient: dbClient}
steps.s9EventstoreIndexes2 = New09(dbClient) steps.s9EventstoreIndexes2 = New09(dbClient)
steps.s10EventstoreCreationDate = &CorrectCreationDate{dbClient: dbClient} steps.CorrectCreationDate.dbClient = dbClient
err = projection.Create(ctx, dbClient, eventstoreClient, config.Projections, nil, nil) err = projection.Create(ctx, dbClient, eventstoreClient, config.Projections, nil, nil)
logging.OnError(err).Fatal("unable to start projections") logging.OnError(err).Fatal("unable to start projections")
@ -124,7 +124,7 @@ func Setup(config *Config, steps *Steps, masterKey string) {
logging.OnError(err).Fatal("unable to migrate step 8") logging.OnError(err).Fatal("unable to migrate step 8")
err = migration.Migrate(ctx, eventstoreClient, steps.s9EventstoreIndexes2) err = migration.Migrate(ctx, eventstoreClient, steps.s9EventstoreIndexes2)
logging.OnError(err).Fatal("unable to migrate step 9") logging.OnError(err).Fatal("unable to migrate step 9")
err = migration.Migrate(ctx, eventstoreClient, steps.s10EventstoreCreationDate) err = migration.Migrate(ctx, eventstoreClient, steps.CorrectCreationDate)
logging.OnError(err).Fatal("unable to migrate step 10") logging.OnError(err).Fatal("unable to migrate step 10")
for _, repeatableStep := range repeatableSteps { for _, repeatableStep := range repeatableSteps {

2
cmd/setup/steps.yaml
View File

@ -30,3 +30,5 @@ FirstInstance:
MachineKey: MachineKey:
ExpirationDate: ExpirationDate:
Type: Type:
CorrectCreationDate:
FailAfter: 5m