From a0fd52b6e1e4c598f664c8fe071dd31c5d778b04 Mon Sep 17 00:00:00 2001 From: jyz0309 <45495947@qq.com> Date: Tue, 21 Sep 2021 10:37:17 +0800 Subject: [PATCH 1/3] fix log error Signed-off-by: jyz0309 <45495947@qq.com> fix conflict Signed-off-by: jyz0309 <45495947@qq.com> format code Signed-off-by: jyz0309 <45495947@qq.com> --- pkg/proxy/winkernel/proxier.go | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index dc73dbd6a0b..8af99448aaa 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -222,17 +222,6 @@ func (t DualStackCompatTester) DualStackCompatible(networkName string) bool { return true } -func Log(v interface{}, message string, level klog.Level) { - klog.V(level).InfoS("%s", message, "spewConfig", spewSdump(v)) -} - -func LogJson(interfaceName string, v interface{}, message string, level klog.Level) { - jsonString, err := json.Marshal(v) - if err == nil { - klog.V(level).InfoS("%s", message, interfaceName, string(jsonString)) - } -} - func spewSdump(v interface{}) string { scs := spew.NewDefaultConfig() scs.DisableMethods = true @@ -442,7 +431,7 @@ func newSourceVIP(hns HostNetworkService, network string, ip string, mac string, } func (ep *endpointsInfo) Cleanup() { - Log(ep, "Endpoint Cleanup", 3) + klog.V(3).InfoS("Endpoint cleanup", "spewConfig", spewSdump(ep)) if !ep.GetIsLocal() && ep.refCount != nil { *ep.refCount-- @@ -787,7 +776,7 @@ func CleanupLeftovers() (encounteredError bool) { } func (svcInfo *serviceInfo) cleanupAllPolicies(endpoints []proxy.Endpoint) { - Log(svcInfo, "Service Cleanup", 3) + klog.V(3).InfoS("Service cleanup", "spewConfig", spewSdump(svcInfo)) // Skip the svcInfo.policyApplied check to remove all the policies svcInfo.deleteAllHnsLoadBalancerPolicy() // Cleanup Endpoints references @@ -829,7 +818,9 @@ func deleteAllHnsLoadBalancerPolicy() { return } for _, plist := range plists { - LogJson("policyList", plist, "Remove Policy", 3) + if jsonString, err := json.Marshal(plist); err == nil { + klog.V(3).InfoS("Remove policy", "policyList", jsonString) + } _, err = plist.Delete() if err != nil { klog.ErrorS(err, "Failed to delete policy list") @@ -1197,7 +1188,9 @@ func (proxier *Proxier) syncProxyRules() { } // Save the hnsId for reference - LogJson("endpointInfo", newHnsEndpoint, "Hns Endpoint resource", 1) + if jsonString, err := json.Marshal(plist); err == nil { + klog.V(1).InfoS("Hns endpoint resource", "endpointInfo", jsonString) + } hnsEndpoints = append(hnsEndpoints, *newHnsEndpoint) if newHnsEndpoint.GetIsLocal() { hnsLocalEndpoints = append(hnsLocalEndpoints, *newHnsEndpoint) @@ -1209,7 +1202,7 @@ func (proxier *Proxier) syncProxyRules() { ep.hnsID = newHnsEndpoint.hnsID - Log(ep, "Endpoint resource found", 3) + klog.V(3).InfoS("Endpoint resource found", "spewConfig", spewSdump(ep)) } klog.V(3).InfoS("Associated endpoints for service", "spewConfig", spewSdump(hnsEndpoints), "svcName", svcName.String()) @@ -1327,7 +1320,7 @@ func (proxier *Proxier) syncProxyRules() { klog.V(3).InfoS("Hns LoadBalancer resource created for loadBalancer Ingress resources", "lbIngressIP", lbIngressIP) } svcInfo.policyApplied = true - Log(svcInfo, "+++Policy Successfully applied for service +++", 2) + klog.V(2).InfoS("Policy Successfully applied for service", "spewConfig", spewSdump(svcInfo)) } if proxier.healthzServer != nil { From c0e0fae775f368f093facbc26661275a9acb2e00 Mon Sep 17 00:00:00 2001 From: jyz0309 <45495947@qq.com> Date: Tue, 21 Sep 2021 11:03:26 +0800 Subject: [PATCH 2/3] fix error Signed-off-by: jyz0309 <45495947@qq.com> use InfoS handle json Signed-off-by: jyz0309 <45495947@qq.com> remove import Signed-off-by: jyz0309 <45495947@qq.com> fix comment Signed-off-by: jyz0309 <45495947@qq.com> --- pkg/proxy/winkernel/proxier.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index 8af99448aaa..13eb845c33d 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -20,7 +20,6 @@ limitations under the License. package winkernel import ( - "encoding/json" "fmt" "net" "os" @@ -431,7 +430,7 @@ func newSourceVIP(hns HostNetworkService, network string, ip string, mac string, } func (ep *endpointsInfo) Cleanup() { - klog.V(3).InfoS("Endpoint cleanup", "spewConfig", spewSdump(ep)) + klog.V(3).InfoS("Endpoint cleanup", "endpointsInfo", ep) if !ep.GetIsLocal() && ep.refCount != nil { *ep.refCount-- @@ -776,7 +775,7 @@ func CleanupLeftovers() (encounteredError bool) { } func (svcInfo *serviceInfo) cleanupAllPolicies(endpoints []proxy.Endpoint) { - klog.V(3).InfoS("Service cleanup", "spewConfig", spewSdump(svcInfo)) + klog.V(3).InfoS("Service cleanup", "serviceInfo", svcInfo) // Skip the svcInfo.policyApplied check to remove all the policies svcInfo.deleteAllHnsLoadBalancerPolicy() // Cleanup Endpoints references @@ -818,9 +817,7 @@ func deleteAllHnsLoadBalancerPolicy() { return } for _, plist := range plists { - if jsonString, err := json.Marshal(plist); err == nil { - klog.V(3).InfoS("Remove policy", "policyList", jsonString) - } + klog.V(3).InfoS("Remove policy", "policyList", plist) _, err = plist.Delete() if err != nil { klog.ErrorS(err, "Failed to delete policy list") @@ -1188,9 +1185,8 @@ func (proxier *Proxier) syncProxyRules() { } // Save the hnsId for reference - if jsonString, err := json.Marshal(plist); err == nil { - klog.V(1).InfoS("Hns endpoint resource", "endpointInfo", jsonString) - } + klog.V(1).InfoS("Hns endpoint resource", "endpointInfo", newHnsEndpoint) + hnsEndpoints = append(hnsEndpoints, *newHnsEndpoint) if newHnsEndpoint.GetIsLocal() { hnsLocalEndpoints = append(hnsLocalEndpoints, *newHnsEndpoint) @@ -1202,7 +1198,7 @@ func (proxier *Proxier) syncProxyRules() { ep.hnsID = newHnsEndpoint.hnsID - klog.V(3).InfoS("Endpoint resource found", "spewConfig", spewSdump(ep)) + klog.V(3).InfoS("Endpoint resource found", "endpointsInfo", ep) } klog.V(3).InfoS("Associated endpoints for service", "spewConfig", spewSdump(hnsEndpoints), "svcName", svcName.String()) From e9abf3dfc69c3800e0a39b5afb8194fc761d6074 Mon Sep 17 00:00:00 2001 From: jyz0309 <45495947@qq.com> Date: Tue, 21 Sep 2021 22:36:25 +0800 Subject: [PATCH 3/3] remove spew Signed-off-by: jyz0309 <45495947@qq.com> remove spew Signed-off-by: jyz0309 <45495947@qq.com> remove LogJson Signed-off-by: jyz0309 <45495947@qq.com> change name Signed-off-by: jyz0309 <45495947@qq.com> remove spew Signed-off-by: jyz0309 <45495947@qq.com> --- pkg/proxy/winkernel/hnsV1.go | 6 +++--- pkg/proxy/winkernel/hnsV2.go | 5 ++--- pkg/proxy/winkernel/proxier.go | 21 +++++++-------------- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/pkg/proxy/winkernel/hnsV1.go b/pkg/proxy/winkernel/hnsV1.go index 57073eaa0c8..68ac02c29b3 100644 --- a/pkg/proxy/winkernel/hnsV1.go +++ b/pkg/proxy/winkernel/hnsV1.go @@ -194,7 +194,7 @@ func (hns hnsV1) getLoadBalancer(endpoints []endpointsInfo, flags loadBalancerFl } else if len(elbPolicy.VIPs) != 0 { continue } - LogJson("policyList", plist, "Found existing Hns loadbalancer policy resource", 1) + klog.V(1).InfoS("Found existing Hns loadbalancer policy resource", "policies", plist) return &loadBalancerInfo{ hnsID: plist.ID, }, nil @@ -220,7 +220,7 @@ func (hns hnsV1) getLoadBalancer(endpoints []endpointsInfo, flags loadBalancerFl ) if err == nil { - LogJson("policyList", lb, "Hns loadbalancer policy resource", 1) + klog.V(1).InfoS("Hns loadbalancer policy resource", "policies", lb) } else { return nil, err } @@ -239,7 +239,7 @@ func (hns hnsV1) deleteLoadBalancer(hnsID string) error { if err != nil { return err } - LogJson("policyList", hnsloadBalancer, "Removing Policy", 2) + klog.V(2).InfoS("Removing Policy", "policies", hnsloadBalancer) _, err = hnsloadBalancer.Delete() return err diff --git a/pkg/proxy/winkernel/hnsV2.go b/pkg/proxy/winkernel/hnsV2.go index 188e5e4e606..f44b3ccab4e 100644 --- a/pkg/proxy/winkernel/hnsV2.go +++ b/pkg/proxy/winkernel/hnsV2.go @@ -202,7 +202,7 @@ func (hns hnsV2) getLoadBalancer(endpoints []endpointsInfo, flags loadBalancerFl } else if len(plist.FrontendVIPs) != 0 { continue } - LogJson("policyList", plist, "Found existing Hns loadbalancer policy resource", 1) + klog.V(1).InfoS("Found existing Hns loadbalancer policy resource", "policies", plist) return &loadBalancerInfo{ hnsID: plist.Id, }, nil @@ -281,8 +281,7 @@ func (hns hnsV2) getLoadBalancer(endpoints []endpointsInfo, flags loadBalancerFl return nil, err } - LogJson("hostComputeLoadBalancer", lb, "Hns loadbalancer policy resource", 1) - + klog.V(1).InfoS("Hns loadbalancer policy resource", "loadBalancer", lb) return &loadBalancerInfo{ hnsID: lb.Id, }, err diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index 13eb845c33d..f5f9adfef40 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -31,7 +31,6 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/hcn" - "github.com/davecgh/go-spew/spew" v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" @@ -221,12 +220,6 @@ func (t DualStackCompatTester) DualStackCompatible(networkName string) bool { return true } -func spewSdump(v interface{}) string { - scs := spew.NewDefaultConfig() - scs.DisableMethods = true - return scs.Sdump(v) -} - // internal struct for endpoints information type endpointsInfo struct { ip string @@ -817,7 +810,7 @@ func deleteAllHnsLoadBalancerPolicy() { return } for _, plist := range plists { - klog.V(3).InfoS("Remove policy", "policyList", plist) + klog.V(3).InfoS("Remove policy", "policies", plist) _, err = plist.Delete() if err != nil { klog.ErrorS(err, "Failed to delete policy list") @@ -1046,7 +1039,7 @@ func (proxier *Proxier) syncProxyRules() { } if svcInfo.policyApplied { - klog.V(4).InfoS("Policy already applied", "spewConfig", spewSdump(svcInfo)) + klog.V(4).InfoS("Policy already applied", "serviceInfo", svcInfo) continue } @@ -1143,7 +1136,7 @@ func (proxier *Proxier) syncProxyRules() { newHnsEndpoint, err = hns.createEndpoint(hnsEndpoint, hnsNetworkName) if err != nil { - klog.ErrorS(err, "Remote endpoint creation failed", "spewConfig", spewSdump(hnsEndpoint)) + klog.ErrorS(err, "Remote endpoint creation failed", "endpointsInfo", hnsEndpoint) continue } } else { @@ -1185,7 +1178,7 @@ func (proxier *Proxier) syncProxyRules() { } // Save the hnsId for reference - klog.V(1).InfoS("Hns endpoint resource", "endpointInfo", newHnsEndpoint) + klog.V(1).InfoS("Hns endpoint resource", "endpointsInfo", newHnsEndpoint) hnsEndpoints = append(hnsEndpoints, *newHnsEndpoint) if newHnsEndpoint.GetIsLocal() { @@ -1201,7 +1194,7 @@ func (proxier *Proxier) syncProxyRules() { klog.V(3).InfoS("Endpoint resource found", "endpointsInfo", ep) } - klog.V(3).InfoS("Associated endpoints for service", "spewConfig", spewSdump(hnsEndpoints), "svcName", svcName.String()) + klog.V(3).InfoS("Associated endpoints for service", "endpointsInfo", hnsEndpoints, "svcName", svcName.String()) if len(svcInfo.hnsID) > 0 { // This should not happen @@ -1213,7 +1206,7 @@ func (proxier *Proxier) syncProxyRules() { continue } - klog.V(4).Infof("Trying to Apply Policies for service", "spewConfig", spewSdump(svcInfo)) + klog.V(4).Infof("Trying to apply Policies for service", "serviceInfo", svcInfo) var hnsLoadBalancer *loadBalancerInfo var sourceVip = proxier.sourceVip if containsPublicIP || containsNodeIP { @@ -1316,7 +1309,7 @@ func (proxier *Proxier) syncProxyRules() { klog.V(3).InfoS("Hns LoadBalancer resource created for loadBalancer Ingress resources", "lbIngressIP", lbIngressIP) } svcInfo.policyApplied = true - klog.V(2).InfoS("Policy Successfully applied for service", "spewConfig", spewSdump(svcInfo)) + klog.V(2).InfoS("Policy successfully applied for service", "serviceInfo", svcInfo) } if proxier.healthzServer != nil {