fix: connection handling in setup after migration steps 40, 64 and 70 (#12293)

# Which Problems Are Solved

During the setup step we saw rare cases which caused setup to fail after
executing steps 40, 64 and 70.

# How the Problems Are Solved

Close currently open database connections so that they fetch the correct
type mapping for the `eventstore.command2` database type.

# Additional Changes

Ensure correct order of setup steps 64 and 70.

# Additional Context

None

---------

Co-authored-by: Livio Spring <[email protected]>
This commit is contained in:
Silvan
2026-06-16 15:09:00 +00:00
committed by GitHub
co-authored by Livio Spring
parent dbb0da71af
commit 10087e7389
4 changed files with 29 additions and 3 deletions
+11 -1
View File
@@ -6,6 +6,7 @@ import (
_ "embed"
"fmt"
"github.com/zitadel/zitadel/backend/v3/instrumentation/logging"
"github.com/zitadel/zitadel/internal/database"
"github.com/zitadel/zitadel/internal/eventstore"
)
@@ -26,7 +27,16 @@ func (mig *ChangePushPosition) Execute(ctx context.Context, _ eventstore.Event)
}
stmt := fmt.Sprintf(changePushPosition, inTxOrderType)
_, err = mig.dbClient.ExecContext(ctx, stmt)
return err
if err != nil {
return err
}
// close idle connections to prevent them from using the old prepared statement with the wrong type
// and having wrong plan of `eventstore.command2`-type
for _, conn := range mig.dbClient.Pool.AcquireAllIdle(ctx) {
logging.OnError(ctx, conn.Conn().Close(ctx)).Debug("failed to close idle connection")
conn.Release()
}
return nil
}
func (mig *ChangePushPosition) String() string {