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:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2020-03-17 09:07:12 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2020-03-17 09:07:12 +0300
commitc97634bfb5ef36d50fad2cdcaab384455e422cd0 (patch)
treeed1eda3e8dbb9264d9d77d240c258358e3476335
parentf72235a25a4b7effc65088737ed0d599c91b6d20 (diff)
parent1053c49c22cb46f61ecbfbcd2c27ff9b767560b8 (diff)
Merge branch 'jc-add-storage-to-healthcheck-error' into 'master'
Add storage name to healthcheck error log Closes #2504 See merge request gitlab-org/gitaly!1934
-rw-r--r--changelogs/unreleased/jc-add-storage-to-healthcheck-error.yml5
-rw-r--r--internal/praefect/nodes/manager.go2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/jc-add-storage-to-healthcheck-error.yml b/changelogs/unreleased/jc-add-storage-to-healthcheck-error.yml
new file mode 100644
index 000000000..dca916054
--- /dev/null
+++ b/changelogs/unreleased/jc-add-storage-to-healthcheck-error.yml
@@ -0,0 +1,5 @@
+---
+title: Add storage name to healthcheck error log
+merge_request: 1934
+author:
+type: added
diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go
index 6aff6c233..9a677327e 100644
--- a/internal/praefect/nodes/manager.go
+++ b/internal/praefect/nodes/manager.go
@@ -283,7 +283,7 @@ func (n *nodeStatus) check() {
resp, err := client.Check(ctx, &healthpb.HealthCheckRequest{Service: ""})
if err != nil {
- n.log.WithError(err).WithField("address", n.Address).Warn("error when pinging healthcheck")
+ n.log.WithError(err).WithField("storage", n.Storage).WithField("address", n.Address).Warn("error when pinging healthcheck")
resp = &healthpb.HealthCheckResponse{
Status: healthpb.HealthCheckResponse_UNKNOWN,
}