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

fix(cleanup): cleanup all stuck states (#7145)

Browse Source 
* fix(setup): unmarshal of failed step

* fix(cleanup): cleanup all stuck states

* use lastRun for repeatable steps

* typo

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Silvan
2024-01-05 10:01:48 +01:00
committed by GitHub
parent 41215bdc0a
commit a5d4b08a99
7 changed files with 215 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
internal/migration/migration.go
View File

@@ -36,8 +36,7 @@ type errCheckerMigration interface {
type RepeatableMigration interface {
Migration
SetLastExecution(lastRun map[string]interface{})
Check() bool
Check(lastRun map[string]interface{}) bool
}
func Migrate(ctx context.Context, es *eventstore.Eventstore, migration Migration) (err error) {
@@ -51,7 +50,6 @@ func Migrate(ctx context.Context, es *eventstore.Eventstore, migration Migration
continueOnErr = errChecker.ContinueOnErr
}
// if should, err := checkExec(ctx, es, migration); !should || err != nil {
should, err := checkExec(ctx, es, migration)
if err != nil && !continueOnErr(err) {
return err
@@ -76,23 +74,18 @@ func Migrate(ctx context.Context, es *eventstore.Eventstore, migration Migration
return pushErr
}
func LatestStep(ctx context.Context, es *eventstore.Eventstore) (*SetupStep, error) {
events, err := es.Filter(ctx, eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
OrderDesc().
Limit(1).
AddQuery().
AggregateTypes(aggregateType).
AggregateIDs(aggregateID).
EventTypes(StartedType, doneType, repeatableDoneType, failedType).
Builder())
func LastStuckStep(ctx context.Context, es *eventstore.Eventstore) (*SetupStep, error) {
var states StepStates
err := es.FilterToQueryReducer(ctx, &states)
if err != nil {
return nil, err
}
step, ok := events[0].(*SetupStep)
if !ok {
return nil, zerrors.ThrowInternal(nil, "MIGRA-hppLM", "setup step is malformed")
step := states.lastByState(StepStarted)
if step == nil {
return nil, nil
}
return step, nil
return step.SetupStep, nil
}
var _ Migration = (*cancelMigration)(nil)
@@ -143,49 +136,26 @@ func checkExec(ctx context.Context, es *eventstore.Eventstore, migration Migrati
}
func shouldExec(ctx context.Context, es *eventstore.Eventstore, migration Migration) (should bool, err error) {
events, err := es.Filter(ctx, eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
OrderAsc().
InstanceID("").
AddQuery().
AggregateTypes(aggregateType).
AggregateIDs(aggregateID).
EventTypes(StartedType, doneType, repeatableDoneType, failedType).
Builder())
var states StepStates
err = es.FilterToQueryReducer(ctx, &states)
if err != nil {
return false, err
}
var isStarted bool
for _, event := range events {
e, ok := event.(*SetupStep)
if !ok {
return false, zerrors.ThrowInternal(nil, "MIGRA-IJY3D", "Errors.Internal")
}
if e.Name != migration.String() {
continue
}
switch event.Type() {
case StartedType, failedType:
isStarted = !isStarted
case doneType,
repeatableDoneType:
repeatable, ok := migration.(RepeatableMigration)
if !ok {
return false, nil
}
isStarted = false
repeatable.SetLastExecution(e.LastRun.(map[string]interface{}))
}
}
if isStarted {
return false, errMigrationAlreadyStarted
}
repeatable, ok := migration.(RepeatableMigration)
if !ok {
step := states.byName(migration.String())
if step == nil {
return true, nil
}
return repeatable.Check(), nil
if step.state == StepFailed {
return true, nil
}
if step.state == StepStarted {
return false, errMigrationAlreadyStarted
}
repeatable, ok := migration.(RepeatableMigration)
if !ok {
return step.state != StepDone, nil
}
lastRun, _ := step.LastRun.(map[string]interface{})
return repeatable.Check(lastRun), nil
}