From 9890a9d38234d23e49f78f39ae2b125c2b382ab9 Mon Sep 17 00:00:00 2001 From: Sami Hiltunen Date: Tue, 26 Nov 2024 17:37:38 +0100 Subject: [PATCH] Revert "partition: Wire migration manager" This reverts commit 2de197a103019e2b7ee481cf48efb23957ba1e6f. --- internal/cli/gitaly/serve.go | 25 ++++++--------- internal/cli/gitaly/subcmd_recovery.go | 13 +++----- .../storagemgr/partition/migration/factory.go | 32 ------------------- .../storagemgr/partition/migration/manager.go | 10 ------ internal/testhelper/testserver/gitaly.go | 17 ++++------ 5 files changed, 22 insertions(+), 75 deletions(-) delete mode 100644 internal/gitaly/storage/storagemgr/partition/migration/factory.go diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go index 5a17edf5e66..a25e87c9e6e 100644 --- a/internal/cli/gitaly/serve.go +++ b/internal/cli/gitaly/serve.go @@ -39,7 +39,6 @@ import ( nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/snapshot" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" @@ -410,13 +409,11 @@ func run(appCtx *cli.Context, cfg config.Cfg, logger log.Logger) error { storagemgr.NewFactory( logger, dbMgr, - migration.NewFactory( - partition.NewFactory( - gitCmdFactory, - localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache), - partitionMetrics, - logConsumer, - ), + partition.NewFactory( + gitCmdFactory, + localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache), + partitionMetrics, + logConsumer, ), 2, storageMetrics, @@ -458,13 +455,11 @@ func run(appCtx *cli.Context, cfg config.Cfg, logger log.Logger) error { storagemgr.NewFactory( logger, dbMgr, - migration.NewFactory( - partition.NewFactory( - gitCmdFactory, - localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache), - partitionMetrics, - nil, - ), + partition.NewFactory( + gitCmdFactory, + localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache), + partitionMetrics, + nil, ), // In recovery mode we don't want to keep inactive partitions active. The cache // however can't be disabled so simply set it to one. diff --git a/internal/cli/gitaly/subcmd_recovery.go b/internal/cli/gitaly/subcmd_recovery.go index ba71551c218..b348e9ba5b0 100644 --- a/internal/cli/gitaly/subcmd_recovery.go +++ b/internal/cli/gitaly/subcmd_recovery.go @@ -22,7 +22,6 @@ import ( nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/snapshot" "gitlab.com/gitlab-org/gitaly/v16/internal/helper" "gitlab.com/gitlab-org/gitaly/v16/internal/log" @@ -123,13 +122,11 @@ func recoveryStatusAction(ctx *cli.Context) (returnErr error) { storagemgr.NewFactory( logger, dbMgr, - migration.NewFactory( - partition.NewFactory( - gitCmdFactory, - localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache), - partitionMetrics, - nil, - ), + partition.NewFactory( + gitCmdFactory, + localrepo.NewFactory(logger, locator, gitCmdFactory, catfileCache), + partitionMetrics, + nil, ), 1, storageMetrics, diff --git a/internal/gitaly/storage/storagemgr/partition/migration/factory.go b/internal/gitaly/storage/storagemgr/partition/migration/factory.go deleted file mode 100644 index eed0e3ca0b5..00000000000 --- a/internal/gitaly/storage/storagemgr/partition/migration/factory.go +++ /dev/null @@ -1,32 +0,0 @@ -package migration - -import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" -) - -// migrationFactory defines a partition factory that wraps another partition factory. -type migrationFactory struct { - factory storagemgr.PartitionFactory -} - -// NewFactory returns a new Factory. -func NewFactory(factory storagemgr.PartitionFactory) storagemgr.PartitionFactory { - return &migrationFactory{factory: factory} -} - -// New returns a new Partition instance. -func (f migrationFactory) New( - logger log.Logger, - partitionID storage.PartitionID, - db keyvalue.Transactioner, - storageName string, - storagePath string, - absoluteStateDir string, - stagingDir string, -) storagemgr.Partition { - partition := f.factory.New(logger, partitionID, db, storageName, storagePath, absoluteStateDir, stagingDir) - return NewPartition(partition, logger) -} diff --git a/internal/gitaly/storage/storagemgr/partition/migration/manager.go b/internal/gitaly/storage/storagemgr/partition/migration/manager.go index 2fe1e8c92d7..5724a595e42 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/manager.go @@ -38,16 +38,6 @@ type migrationManager struct { migrationStates map[string]*migrationState } -// NewPartition creates a migration manager that wraps the provided partition. -func NewPartition(partition storagemgr.Partition, logger log.Logger) storagemgr.Partition { - return &migrationManager{ - Partition: partition, - logger: logger, - migrations: migrations, - migrationStates: map[string]*migrationState{}, - } -} - func (m *migrationManager) Begin(ctx context.Context, opts storage.BeginOptions) (storage.Transaction, error) { if err := m.migrate(ctx, opts.RelativePaths); err != nil { return nil, fmt.Errorf("migrate: %w", err) diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go index 62ab00ae20a..66f7964e7ad 100644 --- a/internal/testhelper/testserver/gitaly.go +++ b/internal/testhelper/testserver/gitaly.go @@ -32,7 +32,6 @@ import ( nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/snapshot" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" @@ -355,16 +354,14 @@ func (gsd *gitalyServerDeps) createDependencies(tb testing.TB, ctx context.Conte storagemgr.NewFactory( gsd.logger, dbMgr, - migration.NewFactory( - partition.NewFactory( - gsd.gitCmdFactory, - localrepo.NewFactory(gsd.logger, gsd.locator, gsd.gitCmdFactory, gsd.catfileCache), - partition.NewMetrics( - housekeeping.NewMetrics(cfg.Prometheus), - snapshot.NewMetrics(), - ), - nil, + partition.NewFactory( + gsd.gitCmdFactory, + localrepo.NewFactory(gsd.logger, gsd.locator, gsd.gitCmdFactory, gsd.catfileCache), + partition.NewMetrics( + housekeeping.NewMetrics(cfg.Prometheus), + snapshot.NewMetrics(), ), + nil, ), storagemgr.DefaultMaxInactivePartitions, storagemgr.NewMetrics(cfg.Prometheus), -- GitLab