Improve debug logging around instance group management

openshift-cloud-team · Aug 31, 2023 · 0ee532a · 0ee532a
1 parent cbc8f49
commit 0ee532a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/providers/gce/gce_instances.go b/providers/gce/gce_instances.go
@@ -65,9 +65,10 @@ func splitNodesByZone(nodes []*v1.Node) map[string][]*v1.Node {
 	return zones
 }
 
-func getZone(n *v1.Node) string {
-	zone, ok := n.Labels[v1.LabelFailureDomainBetaZone]
+func getZone(node *v1.Node) string {
+	zone, ok := node.Labels[v1.LabelFailureDomainBetaZone]
 	if !ok {
+		klog.Warningf("Node without zone label, returning %q as zone. Node name: %v, node labels: %v", defaultZone, node.Name, node.Labels)
 		return defaultZone
 	}
 	return zone

diff --git a/providers/gce/gce_loadbalancer.go b/providers/gce/gce_loadbalancer.go
@@ -245,7 +245,7 @@ func (g *Cloud) UpdateLoadBalancer(ctx context.Context, clusterName string, svc
 		}
 	}
 
-	klog.V(4).Infof("UpdateLoadBalancer(%v, %v, %v, %v, %v): updating with %d nodes", clusterName, svc.Namespace, svc.Name, loadBalancerName, g.region, len(nodes))
+	klog.V(4).Infof("UpdateLoadBalancer(%v, %v, %v, %v, %v): updating with %v nodes [node names limited, total number of nodes: %d]", clusterName, svc.Namespace, svc.Name, loadBalancerName, g.region, loggableNodeNames(nodes), len(nodes))
 
 	switch scheme {
 	case cloud.SchemeInternal:

diff --git a/providers/gce/gce_loadbalancer_external.go b/providers/gce/gce_loadbalancer_external.go
@@ -41,7 +41,8 @@ import (
 )
 
 const (
-	errStrLbNoHosts = "cannot EnsureLoadBalancer() with no hosts"
+	errStrLbNoHosts   = "cannot EnsureLoadBalancer() with no hosts"
+	maxNodeNamesToLog = 50
 )
 
 // ensureExternalLoadBalancer is the external implementation of LoadBalancer.EnsureLoadBalancer.
@@ -819,6 +820,13 @@ func nodeNames(nodes []*v1.Node) []string {
 	return ret
 }
 
+func loggableNodeNames(nodes []*v1.Node) []string {
+	if len(nodes) > maxNodeNamesToLog {
+		return nodeNames(nodes[:maxNodeNamesToLog])
+	}
+	return nodeNames(nodes)
+}
+
 func hostURLToComparablePath(hostURL string) string {
 	idx := strings.Index(hostURL, "/zones/")
 	if idx < 0 {

diff --git a/providers/gce/gce_loadbalancer_internal.go b/providers/gce/gce_loadbalancer_internal.go
@@ -554,7 +554,7 @@ func (g *Cloud) ensureInternalHealthCheck(name string, svcName types.NamespacedN
 }
 
 func (g *Cloud) ensureInternalInstanceGroup(name, zone string, nodes []*v1.Node) (string, error) {
-	klog.V(2).Infof("ensureInternalInstanceGroup(%v, %v): checking group that it contains %v nodes", name, zone, len(nodes))
+	klog.V(2).Infof("ensureInternalInstanceGroup(%v, %v): checking group that it contains %v nodes [node names limited, total number of nodes: %d]", name, zone, loggableNodeNames(nodes), len(nodes))
 	ig, err := g.GetInstanceGroup(name, zone)
 	if err != nil && !isNotFound(err) {
 		return "", err