From 0a0b605afaf335cc00751fe0e1b23f7c77e5744a Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Thu, 24 Oct 2024 09:45:33 -0700 Subject: [PATCH] fix server start race --- go/cmd/dolt/commands/engine/sqlengine.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/go/cmd/dolt/commands/engine/sqlengine.go b/go/cmd/dolt/commands/engine/sqlengine.go index 69100cad8a..c60b978841 100644 --- a/go/cmd/dolt/commands/engine/sqlengine.go +++ b/go/cmd/dolt/commands/engine/sqlengine.go @@ -112,6 +112,11 @@ func NewSqlEngine( all := dbs[:] + // this is overwritten only for server sessions + for _, db := range dbs { + db.DbData().Ddb.SetCommitHookLogger(ctx, cli.CliOut) + } + clusterDB := config.ClusterController.ClusterDatabase() if clusterDB != nil { all = append(all, clusterDB.(dsess.SqlDatabase)) @@ -207,11 +212,6 @@ func NewSqlEngine( } } - // this is overwritten only for server sessions - for _, db := range dbs { - db.DbData().Ddb.SetCommitHookLogger(ctx, cli.CliOut) - } - err = sql.SystemVariables.SetGlobal(dsess.DoltCommitOnTransactionCommit, config.DoltTransactionCommit) if err != nil { return nil, err