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
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-06-12 17:45:33 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-06-12 17:50:57 +0300
commit5bff931d23697f338325be728cba8d2b7ed87677 (patch)
tree6d7c9ac53e89808ceb5b43469b7009ca07942b89
parent0dcb5c579e63754f557aef91a4fa7a00e5b8b127 (diff)
Fix ignored registerNode error
The error was ignored, but that lead to misconfigured nodes not failing at boot time. This changes that to fix it.
-rw-r--r--changelogs/unreleased/zj-register-node-fatal-log.yml5
-rw-r--r--cmd/praefect/main.go4
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-register-node-fatal-log.yml b/changelogs/unreleased/zj-register-node-fatal-log.yml
new file mode 100644
index 000000000..bd4586525
--- /dev/null
+++ b/changelogs/unreleased/zj-register-node-fatal-log.yml
@@ -0,0 +1,5 @@
+---
+title: Log node registration failures
+merge_request:
+author:
+type: fixed
diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go
index 1ec7930ac..60c00c851 100644
--- a/cmd/praefect/main.go
+++ b/cmd/praefect/main.go
@@ -102,7 +102,9 @@ func run(listeners []net.Listener, conf config.Config) error {
allBackendServers := append(conf.SecondaryServers, conf.PrimaryServer)
for _, gitaly := range allBackendServers {
- coordinator.RegisterNode(gitaly.Name, gitaly.ListenAddr)
+ if err := coordinator.RegisterNode(gitaly.Name, gitaly.ListenAddr); err != nil {
+ return fmt.Errorf("failed to register %s: %s", gitaly.Name, err)
+ }
logger.WithField("gitaly listen addr", gitaly.ListenAddr).Info("registered gitaly node")
}