Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorSami Hiltunen <shiltunen@gitlab.com>2021-08-19 18:50:36 +0300
committerSami Hiltunen <shiltunen@gitlab.com>2021-08-19 19:22:39 +0300
commit1fcf22c1049579a1e9d5d4d1fcccfe1e37889028 (patch)
tree2a2302ef3de92e3f8d13c22a7bd806df7fa2e670 /cmd
parent73eb0f44c0484f4730ca334c9b27e8cd0ad9ec86 (diff)
Do not inject replication queue into InfoService
InfoService previously used the replication queue to schedule replication jobs as part of the manual reconciliation command and when accepting data loss. The manual reconciler has been removed and accepting data loss relies on the automatic reconciler. As the InfoService no longer needs to queue replication jobs, this commit removes the unnecessary field and updates the call sites not to inject the queue.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/praefect/subcmd_accept_dataloss_test.go2
-rw-r--r--cmd/praefect/subcmd_dataloss_test.go2
-rw-r--r--cmd/praefect/subcmd_set_replication_factor_test.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/praefect/subcmd_accept_dataloss_test.go b/cmd/praefect/subcmd_accept_dataloss_test.go
index 765bc909b..a702954ac 100644
--- a/cmd/praefect/subcmd_accept_dataloss_test.go
+++ b/cmd/praefect/subcmd_accept_dataloss_test.go
@@ -50,7 +50,7 @@ func TestAcceptDatalossSubcommand(t *testing.T) {
require.NoError(t, rs.SetGeneration(ctx, vs, repo, storage, generation))
}
- ln, clean := listenAndServe(t, []svcRegistrar{registerPraefectInfoServer(info.NewServer(conf, nil, rs, nil, nil, nil))})
+ ln, clean := listenAndServe(t, []svcRegistrar{registerPraefectInfoServer(info.NewServer(conf, rs, nil, nil, nil))})
defer clean()
conf.SocketPath = ln.Addr().String()
diff --git a/cmd/praefect/subcmd_dataloss_test.go b/cmd/praefect/subcmd_dataloss_test.go
index 13f3b7554..5ceded085 100644
--- a/cmd/praefect/subcmd_dataloss_test.go
+++ b/cmd/praefect/subcmd_dataloss_test.go
@@ -83,7 +83,7 @@ func TestDatalossSubcommand(t *testing.T) {
require.NoError(t, gs.SetGeneration(ctx, "virtual-storage-1", "repository-2", "gitaly-3", 0))
ln, clean := listenAndServe(t, []svcRegistrar{
- registerPraefectInfoServer(info.NewServer(cfg, nil, gs, nil, nil, nil))})
+ registerPraefectInfoServer(info.NewServer(cfg, gs, nil, nil, nil))})
defer clean()
for _, tc := range []struct {
desc string
diff --git a/cmd/praefect/subcmd_set_replication_factor_test.go b/cmd/praefect/subcmd_set_replication_factor_test.go
index fe6f52523..59c317f69 100644
--- a/cmd/praefect/subcmd_set_replication_factor_test.go
+++ b/cmd/praefect/subcmd_set_replication_factor_test.go
@@ -92,7 +92,7 @@ func TestSetReplicationFactorSubcommand(t *testing.T) {
)
ln, clean := listenAndServe(t, []svcRegistrar{registerPraefectInfoServer(
- info.NewServer(config.Config{}, nil, nil, store, nil, nil),
+ info.NewServer(config.Config{}, nil, store, nil, nil),
)})
defer clean()