From 5f46c748c0ee6f282e5a2344d2ad451f766d7f2a Mon Sep 17 00:00:00 2001
From: Sebastiaan van Steenis <mail@superseb.nl>
Date: Sat, 21 Mar 2020 18:17:32 +0100
Subject: [PATCH] Standardize (re-)try logging

---
 cluster/cluster.go      | 2 +-
 k8s/node.go             | 2 +-
 services/healthcheck.go | 2 +-
 services/node_util.go   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/cluster.go b/cluster/cluster.go
index 4abfc766..c4db95e8 100644
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -934,7 +934,7 @@ func setNodeAnnotationsLabelsTaints(k8sClient *kubernetes.Clientset, host *hosts
 	for retries := 0; retries <= 5; retries++ {
 		node, err = k8s.GetNode(k8sClient, host.HostnameOverride)
 		if err != nil {
-			logrus.Debugf("[hosts] Can't find node by name [%s], retrying..", host.HostnameOverride)
+			logrus.Debugf("[hosts] Can't find node by name [%s], error: %v", host.HostnameOverride, err)
 			time.Sleep(2 * time.Second)
 			continue
 		}
diff --git a/k8s/node.go b/k8s/node.go
index 1f2e153b..bf5834ae 100644
--- a/k8s/node.go
+++ b/k8s/node.go
@@ -41,7 +41,7 @@ func GetNodeList(k8sClient *kubernetes.Clientset) (*v1.NodeList, error) {
 func GetNode(k8sClient *kubernetes.Clientset, nodeName string) (*v1.Node, error) {
 	var listErr error
 	for retries := 0; retries < MaxRetries; retries++ {
-		logrus.Debugf("Checking node list for node %v, retry #%v", nodeName, retries)
+		logrus.Debugf("Checking node list for node [%v], try #%v", nodeName, retries+1)
 		nodes, err := GetNodeList(k8sClient)
 		if err != nil {
 			listErr = err
diff --git a/services/healthcheck.go b/services/healthcheck.go
index f9a27974..eea8d87a 100644
--- a/services/healthcheck.go
+++ b/services/healthcheck.go
@@ -47,7 +47,7 @@ func runHealthcheck(ctx context.Context, host *hosts.Host, serviceName string, l
 	}
 	for retries := 0; retries < 10; retries++ {
 		if err = getHealthz(client, serviceName, host.Address, url); err != nil {
-			logrus.Debugf("[healthcheck] %v", err)
+			logrus.Debugf("[healthcheck] %v, try #%v", err, retries+1)
 			time.Sleep(5 * time.Second)
 			continue
 		}
diff --git a/services/node_util.go b/services/node_util.go
index 169a15e2..8b5c459e 100644
--- a/services/node_util.go
+++ b/services/node_util.go
@@ -19,7 +19,7 @@ import (
 
 func CheckNodeReady(kubeClient *kubernetes.Clientset, runHost *hosts.Host, component string) error {
 	for retries := 0; retries < k8s.MaxRetries; retries++ {
-		logrus.Infof("[%s] Now checking status of node %v", component, runHost.HostnameOverride)
+		logrus.Infof("[%s] Now checking status of node %v, try #%v", component, runHost.HostnameOverride, retries+1)
 		k8sNode, err := k8s.GetNode(kubeClient, runHost.HostnameOverride)
 		if err != nil {
 			return fmt.Errorf("[%s] Error getting node %v: %v", component, runHost.HostnameOverride, err)