Skip to content

Commit 1b7df5c

Browse files
ivanmatmatioktalz
authored andcommitted
MINOR: add trace logs for endpoints and servers
1 parent 78f9d29 commit 1b7df5c

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

pkg/haproxy/api/runtime.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,15 @@ func (c *clientNative) GetMap(mapFile string) (*models.Map, error) {
7979

8080
// SyncBackendSrvs syncs states and addresses of a backend servers with corresponding endpoints.
8181
func (c *clientNative) SyncBackendSrvs(backend *store.RuntimeBackend, portUpdated bool) error {
82+
logger := utils.GetLogger()
8283
if backend.Name == "" {
8384
return nil
8485
}
86+
logger.Tracef("updating backend %s for haproxy servers update (address and state) through socket", backend.Name)
8587
haproxySrvs := backend.HAProxySrvs
8688
addresses := backend.Endpoints.Addresses
89+
logger.Tracef("backend %s: list of servers %+v", backend.Name, haproxySrvs)
90+
logger.Tracef("backend %s: list of endpoints addresses %+v", backend.Name, addresses)
8791
// Disable stale entries from HAProxySrvs
8892
// and provide list of Disabled Srvs
8993
var disabled []*store.HAProxySrv
@@ -109,18 +113,22 @@ func (c *clientNative) SyncBackendSrvs(backend *store.RuntimeBackend, portUpdate
109113
disabled = disabled[1:]
110114
delete(addresses, newAddr)
111115
}
116+
117+
logger.Tracef("backend %s: list of servers after treatment %+v", backend.Name, haproxySrvs)
118+
logger.Tracef("backend %s: list of endpoints addresses after treatment %+v", backend.Name, addresses)
119+
112120
// Dynamically updates HAProxy backend servers with HAProxySrvs content
113121
var addrErr, stateErr error
114122
for _, srv := range haproxySrvs {
115123
if !srv.Modified {
116124
continue
117125
}
118126
if srv.Address == "" {
119-
// logger.Tracef("server '%s/%s' changed status to %v", newEndpoints.BackendName, srv.Name, "maint")
127+
logger.Tracef("backend %s: server '%s' changed status to %v", backend.Name, srv.Name, "maint")
120128
addrErr = c.SetServerAddr(backend.Name, srv.Name, "127.0.0.1", 0)
121129
stateErr = c.SetServerState(backend.Name, srv.Name, "maint")
122130
} else {
123-
// logger.Tracef("server '%s/%s' changed status to %v", newEndpoints.BackendName, srv.Name, "ready")
131+
logger.Tracef("backend %s: server '%s' changed status to %v", backend.Name, srv.Name, "ready")
124132
addrErr = c.SetServerAddr(backend.Name, srv.Name, srv.Address, int(backend.Endpoints.Port))
125133
stateErr = c.SetServerState(backend.Name, srv.Name, "ready")
126134
}

pkg/service/endpoints.go

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func (s *Service) updateHAProxySrv(client api.HAProxyClient, srvSlot store.HAPro
7474
if s.backend.Cookie != nil && s.backend.Cookie.Type == "insert" {
7575
srv.Cookie = srv.Name
7676
}
77+
logger.Tracef("backend %s: about to update server in configuration file : models.Server { Name: %s, Port: %d, Address: %s, Maintenance: %s }", s.backend.Name, srv.Name, *srv.Port, srv.Address, srv.Maintenance)
7778
// Update server
7879
errAPI := client.BackendServerEdit(s.backend.Name, srv)
7980
if errAPI == nil {
@@ -106,6 +107,7 @@ func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend) (reload bool)
106107
break
107108
}
108109
}
110+
logger.Tracef("backend %s: number of slots %d", backend.Name, srvSlots)
109111
for len(backend.HAProxySrvs) < srvSlots {
110112
srv := &store.HAProxySrv{
111113
Name: fmt.Sprintf("SRV_%d", len(backend.HAProxySrvs)+1),

pkg/store/events.go

+6
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,19 @@ func (k *K8s) EventEndpoints(ns *Namespace, data *Endpoints, syncHAproxySrvs fun
9595
return false
9696
}
9797
}
98+
logger.Tracef("Treating endpoints event %+v", *data)
9899
ns.Endpoints[data.Service][data.SliceName] = data
99100

100101
endpoints := getEndpoints(ns.Endpoints[data.Service])
102+
logger.Tracef("service %s : endpoints list %+v", data.Service, endpoints)
101103
_, ok := ns.HAProxyRuntime[data.Service]
102104
if !ok || len(endpoints) == 0 {
103105
ns.HAProxyRuntime[data.Service] = make(map[string]*RuntimeBackend)
104106
}
107+
logger.Tracef("service %s : number of already existing backend(s) in this transaction for this endpoint: %d", data.Service, len(ns.HAProxyRuntime[data.Service]))
108+
for key, value := range ns.HAProxyRuntime[data.Service] {
109+
logger.Tracef("service %s : port name %s, backend %+v", data.Service, key, *value)
110+
}
105111
for portName, portEndpoints := range endpoints {
106112
newBackend := &RuntimeBackend{Endpoints: portEndpoints}
107113
backend, ok := ns.HAProxyRuntime[data.Service][portName]

pkg/store/types.go

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
package store
1616

1717
import (
18+
"fmt"
19+
1820
"github.com/haproxytech/client-native/v3/models"
1921
)
2022

@@ -34,6 +36,10 @@ type HAProxySrv struct {
3436
Port int64
3537
}
3638

39+
func (h *HAProxySrv) String() string {
40+
return fmt.Sprintf("%+v", *h)
41+
}
42+
3743
// PortEndpoints describes endpoints of a service port
3844
type PortEndpoints struct {
3945
Port int64

0 commit comments

Comments
 (0)