From 654f5a19ce2f3fcd4679acfbb9d037e5df2fbdb1 Mon Sep 17 00:00:00 2001 From: Cool Developer Date: Wed, 20 Mar 2024 17:16:02 -0400 Subject: [PATCH] fix flaky test --- store/root/store.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/store/root/store.go b/store/root/store.go index ba28827123e4..68944c209d24 100644 --- a/store/root/store.go +++ b/store/root/store.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "slices" + "sync" "time" "github.com/cockroachdb/errors" @@ -374,14 +375,21 @@ func (s *Store) StartMigration() error { s.isMigrating = true + mtx := sync.Mutex{} + mtx.Lock() go func() { version := s.lastCommitInfo.Version s.logger.Info("starting migration", "version", version) + mtx.Unlock() if err := s.migrationManager.Start(version, s.chChangeset, s.chDone); err != nil { s.logger.Error("failed to start migration", "err", err) } }() + // wait for the migration manager to start + mtx.Lock() + defer mtx.Unlock() + return nil }