Skip to content

Commit

Permalink
Merge pull request #119110 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-23.1-119017

release-23.1: server: fix MigrationServer.SyncAllEngines
  • Loading branch information
jbowens authored Mar 13, 2024
2 parents e203c6a + 3f79f07 commit c9c153b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/server/migration.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvstorage"
"github.com/cockroachdb/cockroach/pkg/server/serverpb"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/syncutil"
"github.com/cockroachdb/errors"
Expand Down Expand Up @@ -169,8 +170,7 @@ func (m *migrationServer) SyncAllEngines(
m.server.node.waitForAdditionalStoreInit()

for _, eng := range m.server.engines {
batch := eng.NewBatch()
if err := batch.LogData(nil); err != nil {
if err := storage.WriteSyncNoop(eng); err != nil {
return err
}
}
Expand Down

0 comments on commit c9c153b

Please sign in to comment.