From 2625753feda7773bac2a4c3b4f6ef312c46bda3d Mon Sep 17 00:00:00 2001 From: James Liu Date: Tue, 9 Jan 2024 11:00:49 +1100 Subject: Revert "Merge branch 'jliu-track-restored-repos-2' into 'master'" This reverts commit 7de65fabe6eaf803771cf0dd5d53dbaf1e628d56, reversing changes made to 0ffc495be9bb5a8f4ff60764b545443d54210e56. --- internal/backup/backup.go | 54 ++------- internal/backup/backup_test.go | 115 ++----------------- internal/backup/pipeline.go | 34 ++---- internal/backup/pipeline_test.go | 61 ++-------- internal/backup/server_side.go | 56 ++------- internal/backup/server_side_test.go | 125 ++++----------------- internal/cli/gitalybackup/create.go | 2 +- internal/cli/gitalybackup/restore.go | 34 +----- internal/cli/gitalybackup/restore_test.go | 20 +++- .../gitaly/service/repository/remove_all_test.go | 1 - internal/praefect/datastore/repository_store.go | 27 ----- internal/praefect/remove_all.go | 1 - internal/praefect/remove_all_test.go | 1 - internal/praefect/server.go | 3 - internal/praefect/walkrepos.go | 47 -------- internal/praefect/walkrepos_test.go | 88 --------------- proto/go/gitalypb/repository.pb.go | 52 ++++----- proto/go/gitalypb/repository_grpc.pb.go | 5 - proto/repository.proto | 2 - 19 files changed, 113 insertions(+), 615 deletions(-) delete mode 100644 internal/praefect/walkrepos.go delete mode 100644 internal/praefect/walkrepos_test.go diff --git a/internal/backup/backup.go b/internal/backup/backup.go index a15f47abe..5eed0724a 100644 --- a/internal/backup/backup.go +++ b/internal/backup/backup.go @@ -211,56 +211,25 @@ func NewManagerLocal( } } -// RemoveRepository removes the specified repository from its storage. -func (mgr *Manager) RemoveRepository(ctx context.Context, req *RemoveRepositoryRequest) error { - if err := setContextServerInfo(ctx, &req.Server, req.Repo.StorageName); err != nil { - return fmt.Errorf("remove repo: set context: %w", err) +// RemoveAllRepositories removes all repositories in the specified storage name. +func (mgr *Manager) RemoveAllRepositories(ctx context.Context, req *RemoveAllRepositoriesRequest) error { + if err := setContextServerInfo(ctx, &req.Server, req.StorageName); err != nil { + return fmt.Errorf("manager: %w", err) } repoClient, err := mgr.newRepoClient(ctx, req.Server) if err != nil { - return fmt.Errorf("remove repo: create client: %w", err) + return fmt.Errorf("manager: %w", err) } - _, err = repoClient.RemoveRepository(ctx, &gitalypb.RemoveRepositoryRequest{Repository: req.Repo}) + _, err = repoClient.RemoveAll(ctx, &gitalypb.RemoveAllRequest{StorageName: req.StorageName}) if err != nil { - return fmt.Errorf("remove repo: remove: %w", err) + return fmt.Errorf("manager: %w", err) } return nil } -// ListRepositories returns a list of repositories found in the given storage. -func (mgr *Manager) ListRepositories(ctx context.Context, req *ListRepositoriesRequest) (repos []*gitalypb.Repository, err error) { - if err := setContextServerInfo(ctx, &req.Server, req.StorageName); err != nil { - return nil, fmt.Errorf("list repos: set context: %w", err) - } - - internalClient, err := mgr.newInternalClient(ctx, req.Server) - if err != nil { - return nil, fmt.Errorf("list repos: create client: %w", err) - } - - stream, err := internalClient.WalkRepos(ctx, &gitalypb.WalkReposRequest{StorageName: req.StorageName}) - if err != nil { - return nil, fmt.Errorf("list repos: walk: %w", err) - } - - for { - resp, err := stream.Recv() - if errors.Is(err, io.EOF) { - break - } - if err != nil { - return nil, fmt.Errorf("list repos: receiving messages: %w", err) - } - - repos = append(repos, &gitalypb.Repository{RelativePath: resp.RelativePath, StorageName: req.StorageName}) - } - - return repos, nil -} - // Create creates a repository backup. func (mgr *Manager) Create(ctx context.Context, req *CreateRequest) error { if req.VanityRepository == nil { @@ -604,12 +573,3 @@ func (mgr *Manager) newRepoClient(ctx context.Context, server storage.ServerInfo return gitalypb.NewRepositoryServiceClient(conn), nil } - -func (mgr *Manager) newInternalClient(ctx context.Context, server storage.ServerInfo) (gitalypb.InternalGitalyClient, error) { - conn, err := mgr.conns.Dial(ctx, server.Address, server.Token) - if err != nil { - return nil, err - } - - return gitalypb.NewInternalGitalyClient(conn), nil -} diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go index 81e87a33a..14341ec6a 100644 --- a/internal/backup/backup_test.go +++ b/internal/backup/backup_test.go @@ -28,10 +28,13 @@ import ( "google.golang.org/protobuf/proto" ) -func TestManager_RemoveRepository(t *testing.T) { - if testhelper.IsPraefectEnabled() { - t.Skip("local backup manager expects to operate on the local filesystem so cannot operate through praefect") - } +func TestManager_RemoveAllRepositories(t *testing.T) { + testhelper.SkipWithWAL(t, ` +RemoveAll is removing the entire content of the storage. This would also remove the database's and +the transaction manager's disk state. The RPC needs to be updated to shut down all partitions and +the database and only then perform the removal. + +Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) t.Parallel() @@ -55,109 +58,11 @@ func TestManager_RemoveRepository(t *testing.T) { require.NoError(t, err) fsBackup := backup.NewManager(sink, locator, pool) - err = fsBackup.RemoveRepository(ctx, &backup.RemoveRepositoryRequest{ - Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, - Repo: repo, + err = fsBackup.RemoveAllRepositories(ctx, &backup.RemoveAllRepositoriesRequest{ + Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, + StorageName: repo.StorageName, }) require.NoError(t, err) - require.NoDirExists(t, repoPath) - - // With an invalid repository - err = fsBackup.RemoveRepository(ctx, &backup.RemoveRepositoryRequest{ - Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, - Repo: &gitalypb.Repository{StorageName: "nonexistent", RelativePath: "nonexistent"}, - }) - - require.EqualError(t, err, "remove repo: remove: rpc error: code = InvalidArgument desc = storage name not found") -} - -func TestManager_ListRepositories(t *testing.T) { - t.Parallel() - - for _, tc := range []struct { - desc string - repos map[string][]*gitalypb.Repository - }{ - { - desc: "no repos", - repos: make(map[string][]*gitalypb.Repository), - }, - { - desc: "repos in a single storage", - repos: map[string][]*gitalypb.Repository{ - "storage-1": { - {RelativePath: "a", StorageName: "storage-1"}, - {RelativePath: "b", StorageName: "storage-1"}, - }, - }, - }, - { - desc: "repos in multiple storages", - repos: map[string][]*gitalypb.Repository{ - "storage-1": { - {RelativePath: "a", StorageName: "storage-1"}, - {RelativePath: "b", StorageName: "storage-1"}, - }, - "storage-2": { - {RelativePath: "c", StorageName: "storage-2"}, - {RelativePath: "d", StorageName: "storage-2"}, - }, - }, - }, - } { - t.Run(tc.desc, func(t *testing.T) { - if testhelper.IsPraefectEnabled() { - t.Skip("local backup manager expects to operate on the local filesystem so cannot operate through praefect") - } - - var storages []string - for storageName := range tc.repos { - storages = append(storages, storageName) - } - - // We don't really need a "default" storage, but this makes initialisation cleaner since - // WithStorages() takes at least one argument. - cfg := testcfg.Build(t, testcfg.WithStorages("default", storages...)) - cfg.SocketPath = testserver.RunGitalyServer(t, cfg, setup.RegisterAll) - - ctx := testhelper.Context(t) - - for storageName, repos := range tc.repos { - for _, repo := range repos { - storagePath, ok := cfg.StoragePath(storageName) - require.True(t, ok) - - _, _ = gittest.CreateRepository(t, ctx, cfg, gittest.CreateRepositoryConfig{ - SkipCreationViaService: true, - RelativePath: repo.RelativePath, - Storage: config.Storage{Name: storageName, Path: storagePath}, - }) - } - } - - pool := client.NewPool() - defer testhelper.MustClose(t, pool) - - backupRoot := testhelper.TempDir(t) - sink := backup.NewFilesystemSink(backupRoot) - defer testhelper.MustClose(t, sink) - - locator, err := backup.ResolveLocator("pointer", sink) - require.NoError(t, err) - - fsBackup := backup.NewManager(sink, locator, pool) - - for storageName, repos := range tc.repos { - actualRepos, err := fsBackup.ListRepositories(ctx, &backup.ListRepositoriesRequest{ - Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, - StorageName: storageName, - }) - - require.NoError(t, err) - require.EqualValues(t, repos, actualRepos) - } - }) - } } func TestManager_Create(t *testing.T) { diff --git a/internal/backup/pipeline.go b/internal/backup/pipeline.go index 3eb91de91..5672493ac 100644 --- a/internal/backup/pipeline.go +++ b/internal/backup/pipeline.go @@ -16,8 +16,7 @@ import ( type Strategy interface { Create(context.Context, *CreateRequest) error Restore(context.Context, *RestoreRequest) error - ListRepositories(context.Context, *ListRepositoriesRequest) ([]*gitalypb.Repository, error) - RemoveRepository(context.Context, *RemoveRepositoryRequest) error + RemoveAllRepositories(context.Context, *RemoveAllRepositoriesRequest) error } // CreateRequest is the request to create a backup @@ -53,14 +52,9 @@ type RestoreRequest struct { BackupID string } -// RemoveRepositoryRequest is a request to remove an individual repository from its storage. -type RemoveRepositoryRequest struct { - Server storage.ServerInfo - Repo *gitalypb.Repository -} - -// ListRepositoriesRequest is the request to list repositories in a given storage. -type ListRepositoriesRequest struct { +// RemoveAllRepositoriesRequest is the request to remove all repositories in the specified +// storage name. +type RemoveAllRepositoriesRequest struct { Server storage.ServerInfo StorageName string } @@ -187,9 +181,6 @@ type Pipeline struct { pipelineError error cmdErrors *commandErrors - - processedRepos map[string]map[*gitalypb.Repository]struct{} - processedReposMu sync.Mutex } // NewPipeline creates a pipeline that executes backup and restore jobs. @@ -204,7 +195,6 @@ func NewPipeline(log log.Logger, opts ...PipelineOption) (*Pipeline, error) { done: make(chan struct{}), workersByStorage: make(map[string]chan *contextCommand), cmdErrors: &commandErrors{}, - processedRepos: make(map[string]map[*gitalypb.Repository]struct{}), } for _, opt := range opts { @@ -262,19 +252,19 @@ func (p *Pipeline) Handle(ctx context.Context, cmd Command) { } // Done waits for any in progress jobs to complete then reports any accumulated errors -func (p *Pipeline) Done() (processedRepos map[string]map[*gitalypb.Repository]struct{}, err error) { +func (p *Pipeline) Done() error { close(p.done) p.workerWg.Wait() if p.pipelineError != nil { - return nil, fmt.Errorf("pipeline: %w", p.pipelineError) + return fmt.Errorf("pipeline: %w", p.pipelineError) } if len(p.cmdErrors.errs) > 0 { - return nil, fmt.Errorf("pipeline: %w", p.cmdErrors) + return fmt.Errorf("pipeline: %w", p.cmdErrors) } - return p.processedRepos, nil + return nil } // getWorker finds the channel associated with a storage. When no channel is @@ -335,14 +325,6 @@ func (p *Pipeline) processCommand(ctx context.Context, cmd Command) { return } - storageName := cmd.Repository().StorageName - p.processedReposMu.Lock() - if _, ok := p.processedRepos[storageName]; !ok { - p.processedRepos[storageName] = make(map[*gitalypb.Repository]struct{}) - } - p.processedRepos[storageName][cmd.Repository()] = struct{}{} - p.processedReposMu.Unlock() - log.Info(fmt.Sprintf("completed %s", cmd.Name())) } diff --git a/internal/backup/pipeline_test.go b/internal/backup/pipeline_test.go index 37f7c2e5b..04c539a5f 100644 --- a/internal/backup/pipeline_test.go +++ b/internal/backup/pipeline_test.go @@ -98,8 +98,7 @@ func TestPipeline(t *testing.T) { p.Handle(ctx, NewCreateCommand(strategy, CreateRequest{Repository: &gitalypb.Repository{StorageName: "storage1"}})) p.Handle(ctx, NewCreateCommand(strategy, CreateRequest{Repository: &gitalypb.Repository{StorageName: "storage2"}})) } - _, err = p.Done() - require.NoError(t, err) + require.NoError(t, p.Done()) }) } }) @@ -116,16 +115,14 @@ func TestPipeline(t *testing.T) { p.Handle(ctx, NewCreateCommand(strategy, CreateRequest{Repository: &gitalypb.Repository{StorageName: "default"}})) - _, err = p.Done() - require.EqualError(t, err, "pipeline: context canceled") + require.EqualError(t, p.Done(), "pipeline: context canceled") }) } type MockStrategy struct { - CreateFunc func(context.Context, *CreateRequest) error - RestoreFunc func(context.Context, *RestoreRequest) error - RemoveRepositoryFunc func(context.Context, *RemoveRepositoryRequest) error - ListRepositoriesFunc func(context.Context, *ListRepositoriesRequest) ([]*gitalypb.Repository, error) + CreateFunc func(context.Context, *CreateRequest) error + RestoreFunc func(context.Context, *RestoreRequest) error + RemoveAllRepositoriesFunc func(context.Context, *RemoveAllRepositoriesRequest) error } func (s MockStrategy) Create(ctx context.Context, req *CreateRequest) error { @@ -142,20 +139,13 @@ func (s MockStrategy) Restore(ctx context.Context, req *RestoreRequest) error { return nil } -func (s MockStrategy) RemoveRepository(ctx context.Context, req *RemoveRepositoryRequest) error { - if s.RemoveRepositoryFunc != nil { - return s.RemoveRepositoryFunc(ctx, req) +func (s MockStrategy) RemoveAllRepositories(ctx context.Context, req *RemoveAllRepositoriesRequest) error { + if s.RemoveAllRepositoriesFunc != nil { + return s.RemoveAllRepositoriesFunc(ctx, req) } return nil } -func (s MockStrategy) ListRepositories(ctx context.Context, req *ListRepositoriesRequest) ([]*gitalypb.Repository, error) { - if s.ListRepositoriesFunc != nil { - return s.ListRepositoriesFunc(ctx, req) - } - return nil, nil -} - func testPipeline(t *testing.T, init func() *Pipeline) { strategy := MockStrategy{ CreateFunc: func(_ context.Context, req *CreateRequest) error { @@ -232,7 +222,7 @@ func testPipeline(t *testing.T, init func() *Pipeline) { require.Equal(t, tc.level, logEntry.Level) } - _, err := p.Done() + err := p.Done() if tc.level == logrus.ErrorLevel { require.EqualError(t, err, "pipeline: 1 failures encountered:\n - c.git: assert.AnError general error for testing\n") @@ -268,7 +258,7 @@ func testPipeline(t *testing.T, init func() *Pipeline) { for _, cmd := range commands { p.Handle(ctx, cmd) } - _, err := p.Done() + err := p.Done() require.EqualError(t, err, "pipeline: 1 failures encountered:\n - c.git: assert.AnError general error for testing\n") }) } @@ -319,34 +309,3 @@ func TestPipelineError(t *testing.T) { }) } } - -func TestPipelineProcessedRepos(t *testing.T) { - strategy := MockStrategy{} - - repos := map[string]map[*gitalypb.Repository]struct{}{ - "storage1": { - &gitalypb.Repository{RelativePath: "a.git", StorageName: "storage1"}: struct{}{}, - &gitalypb.Repository{RelativePath: "b.git", StorageName: "storage1"}: struct{}{}, - }, - "storage2": { - &gitalypb.Repository{RelativePath: "c.git", StorageName: "storage2"}: struct{}{}, - }, - "storage3": { - &gitalypb.Repository{RelativePath: "d.git", StorageName: "storage3"}: struct{}{}, - }, - } - - p, err := NewPipeline(testhelper.SharedLogger(t)) - require.NoError(t, err) - - ctx := testhelper.Context(t) - for _, v := range repos { - for repo := range v { - p.Handle(ctx, NewRestoreCommand(strategy, RestoreRequest{Repository: repo})) - } - } - - processedRepos, err := p.Done() - require.NoError(t, err) - require.EqualValues(t, repos, processedRepos) -} diff --git a/internal/backup/server_side.go b/internal/backup/server_side.go index a1a9a37eb..35654f215 100644 --- a/internal/backup/server_side.go +++ b/internal/backup/server_side.go @@ -2,9 +2,7 @@ package backup import ( "context" - "errors" "fmt" - "io" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" @@ -95,56 +93,25 @@ func (ss ServerSideAdapter) Restore(ctx context.Context, req *RestoreRequest) er return nil } -// RemoveRepository removes the specified repository from its storage. -func (ss ServerSideAdapter) RemoveRepository(ctx context.Context, req *RemoveRepositoryRequest) error { - if err := setContextServerInfo(ctx, &req.Server, req.Repo.StorageName); err != nil { - return fmt.Errorf("server-side remove repo: set context: %w", err) +// RemoveAllRepositories removes all repositories in the specified storage name. +func (ss ServerSideAdapter) RemoveAllRepositories(ctx context.Context, req *RemoveAllRepositoriesRequest) error { + if err := setContextServerInfo(ctx, &req.Server, req.StorageName); err != nil { + return fmt.Errorf("server-side remove all: %w", err) } repoClient, err := ss.newRepoClient(ctx, req.Server) if err != nil { - return fmt.Errorf("server-side remove repo: create client: %w", err) + return fmt.Errorf("server-side remove all: %w", err) } - _, err = repoClient.RemoveRepository(ctx, &gitalypb.RemoveRepositoryRequest{Repository: req.Repo}) + _, err = repoClient.RemoveAll(ctx, &gitalypb.RemoveAllRequest{StorageName: req.StorageName}) if err != nil { - return fmt.Errorf("server-side remove repo: remove: %w", err) + return fmt.Errorf("server-side remove all: %w", err) } return nil } -// ListRepositories returns a list of repositories found in the given storage. -func (ss ServerSideAdapter) ListRepositories(ctx context.Context, req *ListRepositoriesRequest) (repos []*gitalypb.Repository, err error) { - if err := setContextServerInfo(ctx, &req.Server, req.StorageName); err != nil { - return nil, fmt.Errorf("server-side list repos: set context: %w", err) - } - - internalClient, err := ss.newInternalClient(ctx, req.Server) - if err != nil { - return nil, fmt.Errorf("server-side list repos: create client: %w", err) - } - - stream, err := internalClient.WalkRepos(ctx, &gitalypb.WalkReposRequest{StorageName: req.StorageName}) - if err != nil { - return nil, fmt.Errorf("server-side list repos: walk: %w", err) - } - - for { - resp, err := stream.Recv() - if errors.Is(err, io.EOF) { - break - } - if err != nil { - return nil, err - } - - repos = append(repos, &gitalypb.Repository{RelativePath: resp.RelativePath, StorageName: req.StorageName}) - } - - return repos, nil -} - func (ss ServerSideAdapter) newRepoClient(ctx context.Context, server storage.ServerInfo) (gitalypb.RepositoryServiceClient, error) { conn, err := ss.pool.Dial(ctx, server.Address, server.Token) if err != nil { @@ -153,12 +120,3 @@ func (ss ServerSideAdapter) newRepoClient(ctx context.Context, server storage.Se return gitalypb.NewRepositoryServiceClient(conn), nil } - -func (ss ServerSideAdapter) newInternalClient(ctx context.Context, server storage.ServerInfo) (gitalypb.InternalGitalyClient, error) { - conn, err := ss.pool.Dial(ctx, server.Address, server.Token) - if err != nil { - return nil, err - } - - return gitalypb.NewInternalGitalyClient(conn), nil -} diff --git a/internal/backup/server_side_test.go b/internal/backup/server_side_test.go index 69669df60..2acc547c5 100644 --- a/internal/backup/server_side_test.go +++ b/internal/backup/server_side_test.go @@ -13,11 +13,9 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" ) @@ -259,15 +257,28 @@ func TestServerSideAdapter_Restore(t *testing.T) { } } -func TestServerSideAdapter_RemoveRepository(t *testing.T) { +func TestServerSideAdapter_RemoveAllRepositories(t *testing.T) { + testhelper.SkipWithWAL(t, ` +RemoveAll is removing the entire content of the storage. This would also remove the database's and +the transaction manager's disk state. The RPC needs to be updated to shut down all partitions and +the database and only then perform the removal. + +Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) + t.Parallel() - db := testdb.New(t) - db.TruncateAll(t) - datastore.NewPostgresRepositoryStore(db, map[string][]string{"virtual-storage": {"default"}}) + backupRoot := testhelper.TempDir(t) + sink := backup.NewFilesystemSink(backupRoot) + defer testhelper.MustClose(t, sink) + + locator, err := backup.ResolveLocator("pointer", sink) + require.NoError(t, err) cfg := testcfg.Build(t) - cfg.SocketPath = testserver.RunGitalyServer(t, cfg, setup.RegisterAll) + cfg.SocketPath = testserver.RunGitalyServer(t, cfg, setup.RegisterAll, + testserver.WithBackupSink(sink), + testserver.WithBackupLocator(locator), + ) ctx := testhelper.Context(t) @@ -278,103 +289,9 @@ func TestServerSideAdapter_RemoveRepository(t *testing.T) { defer testhelper.MustClose(t, pool) adapter := backup.NewServerSideAdapter(pool) - err := adapter.RemoveRepository(ctx, &backup.RemoveRepositoryRequest{ - Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, - Repo: repo, + err = adapter.RemoveAllRepositories(ctx, &backup.RemoveAllRepositoriesRequest{ + Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, + StorageName: repo.StorageName, }) require.NoError(t, err) - require.NoDirExists(t, repoPath) - - // With an invalid repository - err = adapter.RemoveRepository(ctx, &backup.RemoveRepositoryRequest{ - Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, - Repo: &gitalypb.Repository{StorageName: "default", RelativePath: "nonexistent"}, - }) - - require.EqualError(t, err, "server-side remove repo: remove: rpc error: code = NotFound desc = repository does not exist") -} - -func TestServerSideAdapter_ListRepositories(t *testing.T) { - t.Parallel() - - for _, tc := range []struct { - desc string - repos map[string][]*gitalypb.Repository - }{ - { - desc: "no repos", - repos: make(map[string][]*gitalypb.Repository), - }, - { - desc: "repos in a single storage", - repos: map[string][]*gitalypb.Repository{ - "storage-1": { - {RelativePath: "a", StorageName: "storage-1"}, - {RelativePath: "b", StorageName: "storage-1"}, - }, - }, - }, - { - desc: "repos in multiple storages", - repos: map[string][]*gitalypb.Repository{ - "storage-1": { - {RelativePath: "a", StorageName: "storage-1"}, - {RelativePath: "b", StorageName: "storage-1"}, - }, - "storage-2": { - {RelativePath: "c", StorageName: "storage-2"}, - {RelativePath: "d", StorageName: "storage-2"}, - }, - }, - }, - } { - t.Run(tc.desc, func(t *testing.T) { - var storages []string - for storageName := range tc.repos { - storages = append(storages, storageName) - } - - db := testdb.New(t) - db.TruncateAll(t) - rs := datastore.NewPostgresRepositoryStore(db, map[string][]string{"virtual-storage": storages}) - - // We don't really need a "default" storage, but this makes initialisation cleaner since - // WithStorages() takes at least one argument. - cfg := testcfg.Build(t, testcfg.WithStorages("default", storages...)) - cfg.SocketPath = testserver.RunGitalyServer(t, cfg, setup.RegisterAll) - - ctx := testhelper.Context(t) - - repoID := 1 - for storageName, repos := range tc.repos { - for _, repo := range repos { - storagePath, ok := cfg.StoragePath(storageName) - require.True(t, ok) - - _, _ = gittest.CreateRepository(t, ctx, cfg, gittest.CreateRepositoryConfig{ - RelativePath: repo.RelativePath, - Storage: config.Storage{Name: storageName, Path: storagePath}, - }) - - require.NoError(t, rs.CreateRepository(ctx, int64(repoID), "virtual-storage", repo.RelativePath, repo.RelativePath, storageName, nil, nil, false, false)) - - repoID++ - } - } - - pool := client.NewPool() - defer testhelper.MustClose(t, pool) - - adapter := backup.NewServerSideAdapter(pool) - - for storageName, repos := range tc.repos { - actualRepos, err := adapter.ListRepositories(ctx, &backup.ListRepositoriesRequest{ - Server: storage.ServerInfo{Address: cfg.SocketPath, Token: cfg.Auth.Token}, - StorageName: storageName, - }) - require.NoError(t, err) - require.EqualValues(t, repos, actualRepos) - } - }) - } } diff --git a/internal/cli/gitalybackup/create.go b/internal/cli/gitalybackup/create.go index be7e75cdb..4ad653490 100644 --- a/internal/cli/gitalybackup/create.go +++ b/internal/cli/gitalybackup/create.go @@ -174,7 +174,7 @@ func (cmd *createSubcommand) run(ctx context.Context, logger log.Logger, stdin i })) } - if _, err := pipeline.Done(); err != nil { + if err := pipeline.Done(); err != nil { return fmt.Errorf("create: %w", err) } return nil diff --git a/internal/cli/gitalybackup/restore.go b/internal/cli/gitalybackup/restore.go index defffa223..de9e2cd3d 100644 --- a/internal/cli/gitalybackup/restore.go +++ b/internal/cli/gitalybackup/restore.go @@ -135,18 +135,15 @@ func (cmd *restoreSubcommand) run(ctx context.Context, logger log.Logger, stdin manager = backup.NewManager(sink, locator, pool) } - // Get the set of existing repositories keyed by storage. We'll later use this to determine any - // dangling repos that should be removed. - existingRepos := make(map[string][]*gitalypb.Repository) for _, storageName := range cmd.removeAllRepositories { - repos, err := manager.ListRepositories(ctx, &backup.ListRepositoriesRequest{ + err := manager.RemoveAllRepositories(ctx, &backup.RemoveAllRepositoriesRequest{ StorageName: storageName, }) if err != nil { - logger.WithError(err).WithField("storage_name", storageName).Warn("failed to list repositories") + // Treat RemoveAll failures as soft failures until we can determine + // how often it fails. + logger.WithError(err).WithField("storage_name", storageName).Warn("failed to remove all repositories") } - - existingRepos[storageName] = repos } var opts []backup.PipelineOption @@ -181,29 +178,8 @@ func (cmd *restoreSubcommand) run(ctx context.Context, logger log.Logger, stdin })) } - restoredRepos, err := pipeline.Done() - if err != nil { + if err := pipeline.Done(); err != nil { return fmt.Errorf("restore: %w", err) } - - var removalErrors []error - for storageName, repos := range existingRepos { - for _, repo := range repos { - if dangling := restoredRepos[storageName][repo]; dangling == struct{}{} { - // If we have dangling repos (those which exist in the storage but - // weren't part of the restore), they need to be deleted so the - // state of repos in Gitaly matches that in the Rails DB. - if err := manager.RemoveRepository(ctx, &backup.RemoveRepositoryRequest{Repo: repo}); err != nil { - removalErrors = append(removalErrors, fmt.Errorf("storage_name %q relative_path %q: %w", storageName, repo.RelativePath, err)) - } - } - } - } - - if len(removalErrors) > 0 { - return fmt.Errorf("remove dangling repositories: %d failures encountered: %w", - len(removalErrors), errors.Join(removalErrors...)) - } - return nil } diff --git a/internal/cli/gitalybackup/restore_test.go b/internal/cli/gitalybackup/restore_test.go index 6d235525c..4eae52e4c 100644 --- a/internal/cli/gitalybackup/restore_test.go +++ b/internal/cli/gitalybackup/restore_test.go @@ -75,6 +75,12 @@ Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) })) } + require.NoError(t, encoder.Encode(map[string]string{ + "address": "invalid", + "token": "invalid", + "relative_path": "invalid", + })) + ctx = testhelper.MergeIncomingMetadata(ctx, testcfg.GitalyServersMetadataFromCfg(t, cfg)) args := []string{ @@ -97,7 +103,9 @@ Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) require.DirExists(t, existRepoPath) - require.NoError(t, cmd.RunContext(ctx, args)) + require.EqualError(t, + cmd.RunContext(ctx, args), + "restore: pipeline: 1 failures encountered:\n - invalid: manager: could not dial source: invalid connection string: \"invalid\"\n") require.NoDirExists(t, existRepoPath) @@ -171,6 +179,12 @@ Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) })) } + require.NoError(t, encoder.Encode(map[string]string{ + "address": "invalid", + "token": "invalid", + "relative_path": "invalid", + })) + ctx = testhelper.MergeIncomingMetadata(ctx, testcfg.GitalyServersMetadataFromCfg(t, cfg)) args := []string{ @@ -193,7 +207,9 @@ Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) require.DirExists(t, existRepoPath) - require.NoError(t, cmd.RunContext(ctx, args)) + require.EqualError(t, + cmd.RunContext(ctx, args), + "restore: pipeline: 1 failures encountered:\n - invalid: server-side restore: could not dial source: invalid connection string: \"invalid\"\n") require.NoDirExists(t, existRepoPath) diff --git a/internal/gitaly/service/repository/remove_all_test.go b/internal/gitaly/service/repository/remove_all_test.go index fd913523a..785f54b01 100644 --- a/internal/gitaly/service/repository/remove_all_test.go +++ b/internal/gitaly/service/repository/remove_all_test.go @@ -28,7 +28,6 @@ Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) require.DirExists(t, repo1Path) require.DirExists(t, repo1Path) - //nolint:staticcheck _, err := client.RemoveAll(ctx, &gitalypb.RemoveAllRequest{ StorageName: cfg.Storages[0].Name, }) diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go index 4925fcb50..77dce6ba0 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -111,8 +111,6 @@ type RepositoryStore interface { MarkVirtualStorageUnverified(ctx context.Context, virtualStorage string) (int64, error) // MarkStorageUnverified marsk all replicas on the storage as unverified. MarkStorageUnverified(ctx context.Context, virtualStorage, storage string) (int64, error) - // ListRepositoryPaths retrieves the relative path for all repositories present on the given virtual storage. - ListRepositoryPaths(ctx context.Context, virtualStorage string) ([]string, error) } // PostgresRepositoryStore is a Postgres implementation of RepositoryStore. @@ -918,28 +916,3 @@ func (rs *PostgresRepositoryStore) GetReplicaPath(ctx context.Context, repositor return replicaPath, nil } - -// ListRepositoryPaths retrieves the relative path for all repositories present on the given virtual storage. -func (rs *PostgresRepositoryStore) ListRepositoryPaths(ctx context.Context, virtualStorage string) ([]string, error) { - rows, err := rs.db.QueryContext(ctx, ` -SELECT relative_path -FROM repositories -WHERE virtual_storage = $1 -`, virtualStorage) - if err != nil { - return nil, fmt.Errorf("query: %w", err) - } - defer rows.Close() - - var relativePaths []string - for rows.Next() { - var relativePath string - if err := rows.Scan(&relativePath); err != nil { - return nil, fmt.Errorf("scan: %w", err) - } - - relativePaths = append(relativePaths, relativePath) - } - - return relativePaths, rows.Err() -} diff --git a/internal/praefect/remove_all.go b/internal/praefect/remove_all.go index 9c383cd0e..9fa08206f 100644 --- a/internal/praefect/remove_all.go +++ b/internal/praefect/remove_all.go @@ -32,7 +32,6 @@ func RemoveAllHandler(rs datastore.RepositoryStore, conns Connections) grpc.Stre conn := conn group.Go(func() error { - //nolint:staticcheck _, err := gitalypb.NewRepositoryServiceClient(conn).RemoveAll(ctx, &gitalypb.RemoveAllRequest{ StorageName: rewrittenStorage, }) diff --git a/internal/praefect/remove_all_test.go b/internal/praefect/remove_all_test.go index 6b5e6f848..965ffb95b 100644 --- a/internal/praefect/remove_all_test.go +++ b/internal/praefect/remove_all_test.go @@ -96,7 +96,6 @@ Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5269`) _, err = client.RepositorySize(ctx, &gitalypb.RepositorySizeRequest{Repository: &gitalypb.Repository{}}) testhelper.RequireGrpcError(t, errServedByGitaly, err) - //nolint:staticcheck resp, err := client.RemoveAll(ctx, &gitalypb.RemoveAllRequest{StorageName: virtualStorage}) require.NoError(t, err) diff --git a/internal/praefect/server.go b/internal/praefect/server.go index c52b160f5..54cbee079 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -195,9 +195,6 @@ func NewGRPCServer( "DeleteObjectPool": DeleteObjectPoolHandler(deps.RepositoryStore, deps.Logger, deps.Conns), "GetObjectPool": GetObjectPoolHandler(deps.RepositoryStore, deps.Router), }) - proxy.RegisterStreamHandlers(srv, "gitaly.InternalGitaly", map[string]grpc.StreamHandler{ - "WalkRepos": WalkReposHandler(deps.RepositoryStore), - }) } return srv diff --git a/internal/praefect/walkrepos.go b/internal/praefect/walkrepos.go deleted file mode 100644 index 1f321a4c7..000000000 --- a/internal/praefect/walkrepos.go +++ /dev/null @@ -1,47 +0,0 @@ -package praefect - -import ( - "fmt" - - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "google.golang.org/grpc" -) - -// WalkReposHandler implements an interceptor for the WalkRepos RPC, invoked when calling -// through Praefect. Instead of walking the storage directory in the filesystem, this Praefect -// implementation queries the database for all known repositories in the given virtual storage. -// As a consequence, the modification_time parameter can't be populated in the response. -func WalkReposHandler(rs datastore.RepositoryStore) grpc.StreamHandler { - return func(srv interface{}, stream grpc.ServerStream) error { - sendRepo := func(relPath string) error { - return stream.SendMsg(&gitalypb.WalkReposResponse{ - RelativePath: relPath, - }) - } - - var req gitalypb.WalkReposRequest - if err := stream.RecvMsg(&req); err != nil { - return fmt.Errorf("receive request: %w", err) - } - - if req.StorageName == "" { - return structerr.NewInvalidArgument("%w", storage.ErrStorageNotSet) - } - - repos, err := rs.ListRepositoryPaths(stream.Context(), req.StorageName) - if err != nil { - return structerr.NewInternal("list repository paths: %w", err) - } - - for _, repo := range repos { - if err := sendRepo(repo); err != nil { - return structerr.NewInternal("send repository path: %w", err) - } - } - - return nil - } -} diff --git a/internal/praefect/walkrepos_test.go b/internal/praefect/walkrepos_test.go deleted file mode 100644 index 63301caf5..000000000 --- a/internal/praefect/walkrepos_test.go +++ /dev/null @@ -1,88 +0,0 @@ -package praefect - -import ( - "net" - "path/filepath" - "testing" - - "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials/insecure" -) - -func TestWalkReposHandler(t *testing.T) { - t.Parallel() - - db := testdb.New(t) - for _, tc := range []struct { - desc string - request *gitalypb.WalkReposRequest - responses []*gitalypb.WalkReposResponse - expectedErr error - }{ - { - desc: "missing storage name", - request: &gitalypb.WalkReposRequest{}, - expectedErr: structerr.NewInvalidArgument("%w", storage.ErrStorageNotSet), - }, - { - desc: "repositories found", - request: &gitalypb.WalkReposRequest{StorageName: "virtual-storage"}, - responses: []*gitalypb.WalkReposResponse{ - {RelativePath: "relative-path"}, - {RelativePath: "relative-path-2"}, - }, - }, - } { - t.Run(tc.desc, func(t *testing.T) { - db.TruncateAll(t) - rs := datastore.NewPostgresRepositoryStore(db, map[string][]string{"virtual-storage": {"storage"}}) - ctx := testhelper.Context(t) - - require.NoError(t, rs.CreateRepository(ctx, 0, "virtual-storage", "relative-path", "relative-path", "storage", nil, nil, false, false)) - require.NoError(t, rs.CreateRepository(ctx, 1, "virtual-storage", "relative-path-2", "relative-path-2", "storage", nil, nil, false, false)) - - tmp := testhelper.TempDir(t) - - ln, err := net.Listen("unix", filepath.Join(tmp, "praefect")) - require.NoError(t, err) - - srv := NewGRPCServer(&Dependencies{ - Config: config.Config{Failover: config.Failover{ElectionStrategy: config.ElectionStrategyPerRepository}}, - Logger: testhelper.SharedLogger(t), - RepositoryStore: rs, - Registry: protoregistry.GitalyProtoPreregistered, - }, nil) - defer srv.Stop() - - go testhelper.MustServe(t, srv, ln) - - clientConn, err := grpc.DialContext(ctx, "unix://"+ln.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) - require.NoError(t, err) - defer testhelper.MustClose(t, clientConn) - - client := gitalypb.NewInternalGitalyClient(clientConn) - - stream, err := client.WalkRepos(ctx, tc.request) - if tc.expectedErr != nil { - // Consume the first message and test for errors only if we're expecting an error. - _, err = stream.Recv() - testhelper.RequireGrpcError(t, tc.expectedErr, err) - return - } - require.NoError(t, err) - - actualRepos, err := testhelper.Receive(stream.Recv) - require.NoError(t, err) - testhelper.ProtoEqual(t, tc.responses, actualRepos) - }) - } -} diff --git a/proto/go/gitalypb/repository.pb.go b/proto/go/gitalypb/repository.pb.go index bdfd812ed..ca005e2b5 100644 --- a/proto/go/gitalypb/repository.pb.go +++ b/proto/go/gitalypb/repository.pb.go @@ -6163,7 +6163,7 @@ var file_repository_proto_rawDesc = []byte{ 0x1c, 0x0a, 0x09, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x32, 0xb2, 0x20, 0x0a, 0x11, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, + 0x6c, 0x75, 0x65, 0x32, 0xaf, 0x20, 0x0a, 0x11, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5d, 0x0a, 0x10, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, @@ -6399,34 +6399,34 @@ var file_repository_proto_rawDesc = []byte{ 0x79, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x09, 0xfa, 0x97, 0x28, - 0x02, 0x08, 0x02, 0x88, 0x02, 0x01, 0x12, 0x4d, 0x0a, 0x09, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x02, 0x08, 0x02, 0x88, 0x02, 0x01, 0x12, 0x4a, 0x0a, 0x09, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x12, 0x18, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x41, 0x6c, 0x6c, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x0b, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x01, - 0x10, 0x02, 0x88, 0x02, 0x01, 0x12, 0x5d, 0x0a, 0x10, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, - 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x61, - 0x6c, 0x79, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, - 0x28, 0x02, 0x08, 0x02, 0x12, 0x60, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, - 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, - 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x67, 0x69, - 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, - 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x12, 0x60, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, - 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x67, 0x69, - 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, - 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, - 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, - 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x01, + 0x10, 0x02, 0x12, 0x5d, 0x0a, 0x10, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1f, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, + 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, + 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, + 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, + 0x02, 0x12, 0x60, 0x0a, 0x11, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2e, + 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, + 0x79, 0x2e, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, + 0x02, 0x08, 0x01, 0x12, 0x60, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x12, 0x20, 0x2e, 0x67, 0x69, 0x74, 0x61, 0x6c, + 0x79, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x67, 0x69, 0x74, + 0x61, 0x6c, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, + 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, + 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/proto/go/gitalypb/repository_grpc.pb.go b/proto/go/gitalypb/repository_grpc.pb.go index b407b948c..d5af55b94 100644 --- a/proto/go/gitalypb/repository_grpc.pb.go +++ b/proto/go/gitalypb/repository_grpc.pb.go @@ -192,9 +192,7 @@ type RepositoryServiceClient interface { // FullPath reads the "gitlab.fullpath" configuration from the repository's // gitconfig. Returns an error in case the full path has not been configured. FullPath(ctx context.Context, in *FullPathRequest, opts ...grpc.CallOption) (*FullPathResponse, error) - // Deprecated: Do not use. // RemoveAll deletes all repositories on a specified storage. - // Deprecated in favour of individually removing repositories with RemoveRepository. RemoveAll(ctx context.Context, in *RemoveAllRequest, opts ...grpc.CallOption) (*RemoveAllResponse, error) // BackupRepository creates a full or incremental backup streamed directly to // object-storage. The backup is created synchronously. The destination must @@ -959,7 +957,6 @@ func (c *repositoryServiceClient) FullPath(ctx context.Context, in *FullPathRequ return out, nil } -// Deprecated: Do not use. func (c *repositoryServiceClient) RemoveAll(ctx context.Context, in *RemoveAllRequest, opts ...grpc.CallOption) (*RemoveAllResponse, error) { out := new(RemoveAllResponse) err := c.cc.Invoke(ctx, "/gitaly.RepositoryService/RemoveAll", in, out, opts...) @@ -1170,9 +1167,7 @@ type RepositoryServiceServer interface { // FullPath reads the "gitlab.fullpath" configuration from the repository's // gitconfig. Returns an error in case the full path has not been configured. FullPath(context.Context, *FullPathRequest) (*FullPathResponse, error) - // Deprecated: Do not use. // RemoveAll deletes all repositories on a specified storage. - // Deprecated in favour of individually removing repositories with RemoveRepository. RemoveAll(context.Context, *RemoveAllRequest) (*RemoveAllResponse, error) // BackupRepository creates a full or incremental backup streamed directly to // object-storage. The backup is created synchronously. The destination must diff --git a/proto/repository.proto b/proto/repository.proto index 4a5d8dbf8..25d446f61 100644 --- a/proto/repository.proto +++ b/proto/repository.proto @@ -381,13 +381,11 @@ service RepositoryService { } // RemoveAll deletes all repositories on a specified storage. - // Deprecated in favour of individually removing repositories with RemoveRepository. rpc RemoveAll(RemoveAllRequest) returns (RemoveAllResponse) { option (op_type) = { op: MUTATOR scope_level: STORAGE }; - option deprecated = true; } // BackupRepository creates a full or incremental backup streamed directly to -- cgit v1.2.3