From 6344d6b26d99b3a7187e4a1bf36fcd87ef87920d Mon Sep 17 00:00:00 2001 From: jyz0309 <45495947@qq.com> Date: Mon, 20 Sep 2021 19:04:21 +0800 Subject: [PATCH] rebuild msg and rename namespace Signed-off-by: jyz0309 <45495947@qq.com> --- pkg/proxy/config/config.go | 2 +- pkg/proxy/healthcheck/service_health.go | 20 ++++++++++---------- pkg/proxy/winkernel/hnsV1.go | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/proxy/config/config.go b/pkg/proxy/config/config.go index 0692ac7f802..065b499c84b 100644 --- a/pkg/proxy/config/config.go +++ b/pkg/proxy/config/config.go @@ -242,7 +242,7 @@ func (c *EndpointSliceConfig) handleAddEndpointSlice(obj interface{}) { return } for _, h := range c.eventHandlers { - klog.V(4).InfoS("Calling handler.OnEndpointSliceAdd", "endpoints", endpointSlice) + klog.V(4).InfoS("Calling handler.OnEndpointSliceAdd", "endpoints", klog.KObj(endpointSlice)) h.OnEndpointSliceAdd(endpointSlice) } } diff --git a/pkg/proxy/healthcheck/service_health.go b/pkg/proxy/healthcheck/service_health.go index 64e74914847..4edddda793d 100644 --- a/pkg/proxy/healthcheck/service_health.go +++ b/pkg/proxy/healthcheck/service_health.go @@ -104,7 +104,7 @@ func (hcs *server) SyncServices(newServices map[types.NamespacedName]uint16) err // Remove any that are not needed any more. for nsn, svc := range hcs.services { if port, found := newServices[nsn]; !found || port != svc.port { - klog.V(2).InfoS("Closing healthcheck", "namespace", nsn.String(), "port", svc.port) + klog.V(2).InfoS("Closing healthcheck", "service", nsn.String(), "port", svc.port) // errors are loged in closeAll() _ = svc.closeAll() @@ -116,11 +116,11 @@ func (hcs *server) SyncServices(newServices map[types.NamespacedName]uint16) err // Add any that are needed. for nsn, port := range newServices { if hcs.services[nsn] != nil { - klog.V(3).InfoS("Existing healthcheck", "namespace", nsn.String(), "port", port) + klog.V(3).InfoS("Existing healthcheck", "service", nsn.String(), "port", port) continue } - klog.V(2).InfoS("Opening healthcheck", "namespace", nsn.String(), "port", port) + klog.V(2).InfoS("Opening healthcheck", "service", nsn.String(), "port", port) svc := &hcInstance{nsn: nsn, port: port} err := svc.listenAndServeAll(hcs) @@ -137,7 +137,7 @@ func (hcs *server) SyncServices(newServices map[types.NamespacedName]uint16) err UID: types.UID(nsn.String()), }, nil, api.EventTypeWarning, "FailedToStartServiceHealthcheck", "Listen", msg) } - klog.ErrorS(err, msg) + klog.ErrorS(err, "failed to start healthcheck", "node", hcs.hostname, "service", nsn.String(), "port", port) continue } hcs.services[nsn] = svc @@ -181,12 +181,12 @@ func (hcI *hcInstance) listenAndServeAll(hcs *server) error { // start serving go func(hcI *hcInstance, listener net.Listener, httpSrv httpServer) { // Serve() will exit when the listener is closed. - klog.V(3).InfoS("Starting goroutine for healthcheck", "namespace", hcI.nsn.String(), "address", listener.Addr().String()) + klog.V(3).InfoS("Starting goroutine for healthcheck", "service", hcI.nsn.String(), "address", listener.Addr().String()) if err := httpSrv.Serve(listener); err != nil { - klog.ErrorS(err, "Healthcheck closed", "namespace", hcI.nsn.String()) + klog.ErrorS(err, "Healthcheck closed", "service", hcI.nsn.String()) return } - klog.V(3).InfoS("Healthcheck closed", "namespace", hcI.nsn.String(), "address", listener.Addr().String()) + klog.V(3).InfoS("Healthcheck closed", "service", hcI.nsn.String(), "address", listener.Addr().String()) }(hcI, listener, httpSrv) hcI.listeners = append(hcI.listeners, listener) @@ -224,7 +224,7 @@ func (h hcHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { svc, ok := h.hcs.services[h.name] if !ok || svc == nil { h.hcs.lock.RUnlock() - klog.ErrorS(nil, "Received request for closed healthcheck", "namespace", h.name.String()) + klog.ErrorS(nil, "Received request for closed healthcheck", "service", h.name.String()) return } count := svc.endpoints @@ -254,10 +254,10 @@ func (hcs *server) SyncEndpoints(newEndpoints map[types.NamespacedName]int) erro for nsn, count := range newEndpoints { if hcs.services[nsn] == nil { - klog.V(3).InfoS("Not saving endpoints for unknown healthcheck", "namespace", nsn.String()) + klog.V(3).InfoS("Not saving endpoints for unknown healthcheck", "service", nsn.String()) continue } - klog.V(3).InfoS("Reporting endpoints for healthcheck", "endpointCount", count, "namespace", nsn.String()) + klog.V(3).InfoS("Reporting endpoints for healthcheck", "endpointCount", count, "service", nsn.String()) hcs.services[nsn].endpoints = count } for nsn, hci := range hcs.services { diff --git a/pkg/proxy/winkernel/hnsV1.go b/pkg/proxy/winkernel/hnsV1.go index 0eec07f2a38..84b92d46ce5 100644 --- a/pkg/proxy/winkernel/hnsV1.go +++ b/pkg/proxy/winkernel/hnsV1.go @@ -45,7 +45,7 @@ type hnsV1 struct{} func (hns hnsV1) getNetworkByName(name string) (*hnsNetworkInfo, error) { hnsnetwork, err := hcsshim.GetHNSNetworkByName(name) if err != nil { - klog.ErrorS(err, "failed to get HNS network by name") + klog.ErrorS(err, "failed to get HNS network by name", "name", name) return nil, err } @@ -58,7 +58,7 @@ func (hns hnsV1) getNetworkByName(name string) (*hnsNetworkInfo, error) { func (hns hnsV1) getEndpointByID(id string) (*endpointsInfo, error) { hnsendpoint, err := hcsshim.GetHNSEndpointByID(id) if err != nil { - klog.ErrorS(err, "failed to get HNS endpoint by id") + klog.ErrorS(err, "failed to get HNS endpoint by id", "id", id) return nil, err } return &endpointsInfo{ @@ -77,7 +77,7 @@ func (hns hnsV1) getEndpointByID(id string) (*endpointsInfo, error) { func (hns hnsV1) getEndpointByIpAddress(ip string, networkName string) (*endpointsInfo, error) { hnsnetwork, err := hcsshim.GetHNSNetworkByName(networkName) if err != nil { - klog.ErrorS(err, "failed to get HNS network by name") + klog.ErrorS(err, "failed to get HNS network by name", "name", name) return nil, err } @@ -162,7 +162,7 @@ func (hns hnsV1) deleteEndpoint(hnsID string) error { } _, err = hnsendpoint.Delete() if err == nil { - klog.V(3).InfoS("Remote endpoint resource deleted id", "ID", hnsID) + klog.V(3).InfoS("Remote endpoint resource deleted id", "id", hnsID) } return err }