mirrors/kube-router
1
0
Fork 0
mirror of https://github.com/cloudnativelabs/kube-router.git synced 2025-11-20 20:41:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: take family metrics out of defer

Browse Source 
Deferring these will end up making the end times match for both families
as the variables aren't tracked separately. Since these are the same
metrics, it should be safe to emit them at time of generation.
This commit is contained in:
Aaron U'Ren 2023-09-16 13:04:14 -05:00 committed by Aaron U'Ren
parent 301e856a92
commit 68a7d03bac
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/controllers/netpol/network_policy_controller.go
View File

@ -257,17 +257,15 @@ func (npc *NetworkPolicyController) fullPolicySync() {
saveStart := time.Now()
err := iptablesSaveRestore.SaveInto("filter", npc.filterTableRules[ipFamily])
saveEndTime := time.Since(saveStart)
defer func() {
if npc.MetricsEnabled {
switch ipFamily {
case v1core.IPv4Protocol:
metrics.ControllerIptablesV4SaveTime.Observe(saveEndTime.Seconds())
case v1core.IPv6Protocol:
metrics.ControllerIptablesV6SaveTime.Observe(saveEndTime.Seconds())
}
if npc.MetricsEnabled {
switch ipFamily {
case v1core.IPv4Protocol:
metrics.ControllerIptablesV4SaveTime.Observe(saveEndTime.Seconds())
case v1core.IPv6Protocol:
metrics.ControllerIptablesV6SaveTime.Observe(saveEndTime.Seconds())
}
klog.V(2).Infof("Saving %v iptables rules took %v", ipFamily, saveEndTime)
}()
}
klog.V(2).Infof("Saving %v iptables rules took %v", ipFamily, saveEndTime)
if err != nil {
klog.Errorf("Aborting sync. Failed to run iptables-save: %v", err.Error())
@ -298,17 +296,15 @@ func (npc *NetworkPolicyController) fullPolicySync() {
restoreStart := time.Now()
err := iptablesSaveRestore.Restore("filter", npc.filterTableRules[ipFamily].Bytes())
restoreEndTime := time.Since(restoreStart)
defer func() {
if npc.MetricsEnabled {
switch ipFamily {
case v1core.IPv4Protocol:
metrics.ControllerIptablesV4RestoreTime.Observe(restoreEndTime.Seconds())
case v1core.IPv6Protocol:
metrics.ControllerIptablesV6RestoreTime.Observe(restoreEndTime.Seconds())
}
if npc.MetricsEnabled {
switch ipFamily {
case v1core.IPv4Protocol:
metrics.ControllerIptablesV4RestoreTime.Observe(restoreEndTime.Seconds())
case v1core.IPv6Protocol:
metrics.ControllerIptablesV6RestoreTime.Observe(restoreEndTime.Seconds())
}
klog.V(2).Infof("Restoring %v iptables rules took %v", ipFamily, restoreEndTime)
}()
}
klog.V(2).Infof("Restoring %v iptables rules took %v", ipFamily, restoreEndTime)
if err != nil {
klog.Errorf("Aborting sync. Failed to run iptables-restore: %v\n%s",

18
pkg/controllers/netpol/policy.go
View File

@ -151,17 +151,15 @@ func (npc *NetworkPolicyController) syncNetworkPolicyChains(networkPoliciesInfo
err := ipset.Restore()
restoreEndTime := time.Since(restoreStart)
defer func() {
if npc.MetricsEnabled {
switch ipFamily {
case api.IPv4Protocol:
metrics.ControllerPolicyIpsetV4RestoreTime.Observe(restoreEndTime.Seconds())
case api.IPv6Protocol:
metrics.ControllerPolicyIpsetV6RestoreTime.Observe(restoreEndTime.Seconds())
}
if npc.MetricsEnabled {
switch ipFamily {
case api.IPv4Protocol:
metrics.ControllerPolicyIpsetV4RestoreTime.Observe(restoreEndTime.Seconds())
case api.IPv6Protocol:
metrics.ControllerPolicyIpsetV6RestoreTime.Observe(restoreEndTime.Seconds())
}
klog.V(2).Infof("Restoring %v ipset took %v", ipFamily, restoreEndTime)
}()
}
klog.V(2).Infof("Restoring %v ipset took %v", ipFamily, restoreEndTime)
if err != nil {
return nil, nil, fmt.Errorf("failed to perform ipset restore: %w", err)