diff options
| author | John Cai <jcai@gitlab.com> | 2019-06-12 22:19:34 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-06-12 22:19:34 +0300 |
| commit | 7cbe010f500a1fc4a337d3169ca9fdfdafffa0ac (patch) | |
| tree | 5c4037296cc0008ff91957457cdf5dbd3ea6f08d | |
| parent | 07f7d4a34006a4567efaa0c5af793d77cc9a1c32 (diff) | |
| parent | 5bff931d23697f338325be728cba8d2b7ed87677 (diff) | |
Merge branch 'zj-register-node-fatal-log' into 'master'
Fix ignored registerNode error
See merge request gitlab-org/gitaly!1307
| -rw-r--r-- | changelogs/unreleased/zj-register-node-fatal-log.yml | 5 | ||||
| -rw-r--r-- | cmd/praefect/main.go | 4 |
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") } |