From 7d9a6d1de6552f66ca53ee69e072f604b4368c85 Mon Sep 17 00:00:00 2001 From: Shivanshu Raj Shrivastava Date: Thu, 14 Oct 2021 22:17:29 +0530 Subject: [PATCH] Migrated pkg/proxy/ipvs to structured logging (#104932) * migrated ipset.go * migrated graceful_termination.go * fixed vstring * fixed ip set entry, made it consistent * fixed rs logging * resolving review comments for key graceful_termination.go * refactoring ipset.go * included review changes --- pkg/proxy/ipvs/graceful_termination.go | 18 +++++++++--------- pkg/proxy/ipvs/ipset.go | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/proxy/ipvs/graceful_termination.go b/pkg/proxy/ipvs/graceful_termination.go index eb31a50200c..f39cc793884 100644 --- a/pkg/proxy/ipvs/graceful_termination.go +++ b/pkg/proxy/ipvs/graceful_termination.go @@ -62,7 +62,7 @@ func (q *graceTerminateRSList) add(rs *listItem) bool { return false } - klog.V(5).Infof("Adding rs %v to graceful delete rsList", rs) + klog.V(5).InfoS("Adding real server to graceful delete real server list", "realServer", rs) q.list[uniqueRS] = rs return true } @@ -85,11 +85,11 @@ func (q *graceTerminateRSList) flushList(handler func(rsToDelete *listItem) (boo for name, rs := range q.list { deleted, err := handler(rs) if err != nil { - klog.Errorf("Try delete rs %q err: %v", name, err) + klog.ErrorS(err, "Error in deleting real server", "realServer", name) success = false } if deleted { - klog.Infof("lw: remote out of the list: %s", name) + klog.InfoS("Removed real server from graceful delete real server list", "realServer", name) q.remove(rs) } } @@ -140,7 +140,7 @@ func (m *GracefulTerminationManager) GracefulDeleteRS(vs *utilipvs.VirtualServer } deleted, err := m.deleteRsFunc(ele) if err != nil { - klog.Errorf("Delete rs %q err: %v", ele.String(), err) + klog.ErrorS(err, "Error in deleting real server", "realServer", ele) } if deleted { return nil @@ -150,13 +150,13 @@ func (m *GracefulTerminationManager) GracefulDeleteRS(vs *utilipvs.VirtualServer if err != nil { return err } - klog.V(5).Infof("Adding an element to graceful delete rsList: %+v", ele) + klog.V(5).InfoS("Adding real server to graceful delete real server list", "realServer", ele) m.rsList.add(ele) return nil } func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, error) { - klog.V(5).Infof("Trying to delete rs: %s", rsToDelete.String()) + klog.V(5).InfoS("Trying to delete real server", "realServer", rsToDelete) rss, err := m.ipvs.GetRealServers(rsToDelete.VirtualServer) if err != nil { return false, err @@ -167,10 +167,10 @@ func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, e // (existing connections will be deleted on the next packet because sysctlExpireNoDestConn=1) // For other protocols, don't delete until all connections have expired) if utilipvs.IsRsGracefulTerminationNeeded(rsToDelete.VirtualServer.Protocol) && rs.ActiveConn+rs.InactiveConn != 0 { - klog.V(5).Infof("Not deleting, RS %v: %v ActiveConn, %v InactiveConn", rsToDelete.String(), rs.ActiveConn, rs.InactiveConn) + klog.V(5).InfoS("Skip deleting real server till all connection have expired", "realServer", rsToDelete, "activeConnection", rs.ActiveConn, "inactiveConnection", rs.InactiveConn) return false, nil } - klog.V(5).Infof("Deleting rs: %s", rsToDelete.String()) + klog.V(5).InfoS("Deleting real server", "realServer", rsToDelete) err := m.ipvs.DeleteRealServer(rsToDelete.VirtualServer, rs) if err != nil { return false, fmt.Errorf("delete destination %q err: %w", rs.String(), err) @@ -183,7 +183,7 @@ func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, e func (m *GracefulTerminationManager) tryDeleteRs() { if !m.rsList.flushList(m.deleteRsFunc) { - klog.Errorf("Try flush graceful termination list err") + klog.ErrorS(nil, "Try flush graceful termination list error") } } diff --git a/pkg/proxy/ipvs/ipset.go b/pkg/proxy/ipvs/ipset.go index 02eb60d8074..64289a80f27 100644 --- a/pkg/proxy/ipvs/ipset.go +++ b/pkg/proxy/ipvs/ipset.go @@ -110,7 +110,7 @@ func NewIPSet(handle utilipset.Interface, name string, setType utilipset.Type, i if strings.HasPrefix(name, "KUBE-") { name = strings.Replace(name, "KUBE-", "KUBE-6-", 1) if len(name) > 31 { - klog.Warningf("ipset name truncated; [%s] -> [%s]", name, name[:31]) + klog.InfoS("Ipset name truncated", "ipSetName", name, "truncatedName", name[:31]) name = name[:31] } } @@ -147,7 +147,7 @@ func (set *IPSet) resetEntries() { func (set *IPSet) syncIPSetEntries() { appliedEntries, err := set.handle.ListEntries(set.Name) if err != nil { - klog.Errorf("Failed to list ip set entries, error: %v", err) + klog.ErrorS(err, "Failed to list ip set entries") return } @@ -162,18 +162,18 @@ func (set *IPSet) syncIPSetEntries() { for _, entry := range currentIPSetEntries.Difference(set.activeEntries).List() { if err := set.handle.DelEntry(entry, set.Name); err != nil { if !utilipset.IsNotFoundError(err) { - klog.Errorf("Failed to delete ip set entry: %s from ip set: %s, error: %v", entry, set.Name, err) + klog.ErrorS(err, "Failed to delete ip set entry from ip set", "ipSetEntry", entry, "ipSet", set.Name) } } else { - klog.V(3).Infof("Successfully delete legacy ip set entry: %s from ip set: %s", entry, set.Name) + klog.V(3).InfoS("Successfully deleted legacy ip set entry from ip set", "ipSetEntry", entry, "ipSet", set.Name) } } // Create active entries for _, entry := range set.activeEntries.Difference(currentIPSetEntries).List() { if err := set.handle.AddEntry(entry, &set.IPSet, true); err != nil { - klog.Errorf("Failed to add entry: %v to ip set: %s, error: %v", entry, set.Name, err) + klog.ErrorS(err, "Failed to add ip set entry to ip set", "ipSetEntry", entry, "ipSet", set.Name) } else { - klog.V(3).Infof("Successfully add entry: %v to ip set: %s", entry, set.Name) + klog.V(3).InfoS("Successfully added ip set entry to ip set", "ipSetEntry", entry, "ipSet", set.Name) } } } @@ -181,7 +181,7 @@ func (set *IPSet) syncIPSetEntries() { func ensureIPSet(set *IPSet) error { if err := set.handle.CreateSet(&set.IPSet, true); err != nil { - klog.Errorf("Failed to make sure ip set: %v exist, error: %v", set, err) + klog.ErrorS(err, "Failed to make sure existence of ip set", "ipSet", set) return err } return nil @@ -191,13 +191,13 @@ func ensureIPSet(set *IPSet) error { func checkMinVersion(vstring string) bool { version, err := utilversion.ParseGeneric(vstring) if err != nil { - klog.Errorf("vstring (%s) is not a valid version string: %v", vstring, err) + klog.ErrorS(err, "Got invalid version string", "versionString", vstring) return false } minVersion, err := utilversion.ParseGeneric(MinIPSetCheckVersion) if err != nil { - klog.Errorf("MinCheckVersion (%s) is not a valid version string: %v", MinIPSetCheckVersion, err) + klog.ErrorS(err, "Got invalid version string", "versionString", MinIPSetCheckVersion) return false } return !version.LessThan(minVersion)