diff options
author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-12 10:55:07 +0300 |
---|---|---|
committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-12 10:55:07 +0300 |
commit | a4079265eb1b35c794ca45a056984cb13a7c2c82 (patch) | |
tree | 7d44ca4e944309b44b8a457516b1d77cdda9077f | |
parent | b1d5dafcf488f8c48531e2a82dd7a568f01a3b7b (diff) | |
parent | 3f7e50ed389a19a1b7bc8b080670e42c9594a300 (diff) |
Merge branch 'jc-fix-flaky-connectivity-check' into 'master'
Use standard logger for NewGitalyConnectivityCheck
Closes #3902
See merge request gitlab-org/gitaly!4065
-rw-r--r-- | internal/praefect/checks.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/praefect/checks.go b/internal/praefect/checks.go index 6b8c0ecf8..8aa7110e9 100644 --- a/internal/praefect/checks.go +++ b/internal/praefect/checks.go @@ -3,6 +3,7 @@ package praefect import ( "context" "fmt" + "log" migrate "github.com/rubenv/sql-migrate" "gitlab.com/gitlab-org/gitaly/v14/internal/praefect/config" @@ -74,14 +75,12 @@ func NewPraefectMigrationCheck(conf config.Config) *Check { // NewGitalyNodeConnectivityCheck returns a check that ensures Praefect can talk to all nodes of all virtual storages func NewGitalyNodeConnectivityCheck(conf config.Config) *Check { - logger := conf.ConfigureLogger() - return &Check{ Name: "gitaly node connectivity & disk access", Description: "confirms if praefect can reach all of its gitaly nodes, and " + "whether or not the gitaly nodes can read/write from and to its storages.", Run: func(ctx context.Context) error { - return nodes.PingAll(ctx, conf, logger) + return nodes.PingAll(ctx, conf, log.Default()) }, Severity: Fatal, } |