From 541b72854ac279f2a345ff7d3ef858a03bcdce89 Mon Sep 17 00:00:00 2001 From: Asklv Date: Wed, 12 Jun 2024 10:57:47 +0800 Subject: [PATCH] fix: fix unexcepted lookup. Signed-off-by: Asklv --- pkg/agent/monitortool/latency_store.go | 9 +++++---- pkg/apis/stats/v1alpha1/generated.proto | 2 +- pkg/apis/stats/v1alpha1/types.go | 2 +- pkg/apiserver/openapi/zz_generated.openapi.go | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/agent/monitortool/latency_store.go b/pkg/agent/monitortool/latency_store.go index 84265bf35e8..b166b22d063 100644 --- a/pkg/agent/monitortool/latency_store.go +++ b/pkg/agent/monitortool/latency_store.go @@ -259,7 +259,7 @@ func (l *LatencyStore) ConvertList(currentNodeName string) []statsv1alpha1.PeerN // PeerNodeLatencyStats should be a list of size N-1, where N is the number of Nodes in the cluster. // TargetIPLatencyStats will be a list of size 1 (single-stack case) or 2 (dual-stack case). - peerNodeLatencyStatsList := make([]statsv1alpha1.PeerNodeLatencyStats, 0, len(l.nodeIPLatencyMap)-1) + peerNodeLatencyStatsList := make([]statsv1alpha1.PeerNodeLatencyStats, 0, len(l.nodeIPLatencyMap)) for nodeName, nodeIPs := range l.nodeTargetIPsMap { // Even though the current Node should already be excluded from the map, we add an extra check as an additional guarantee. if nodeName == currentNodeName { @@ -269,11 +269,12 @@ func (l *LatencyStore) ConvertList(currentNodeName string) []statsv1alpha1.PeerN targetIPLatencyStats := make([]statsv1alpha1.TargetIPLatencyStats, 0, len(nodeIPs)) for _, nodeIP := range nodeIPs { nodeIPStr := nodeIP.String() + latencyEntry := l.nodeIPLatencyMap[nodeIPStr] entry := statsv1alpha1.TargetIPLatencyStats{ TargetIP: nodeIPStr, - LastSendTime: metav1.NewTime(l.nodeIPLatencyMap[nodeIPStr].LastSendTime), - LastRecvTime: metav1.NewTime(l.nodeIPLatencyMap[nodeIPStr].LastRecvTime), - LastMeasuredRTTNanoseconds: l.nodeIPLatencyMap[nodeIPStr].LastMeasuredRTT.Nanoseconds(), + LastSendTime: metav1.NewTime(latencyEntry.LastSendTime), + LastRecvTime: metav1.NewTime(latencyEntry.LastRecvTime), + LastMeasuredRTTNanoseconds: latencyEntry.LastMeasuredRTT.Nanoseconds(), } targetIPLatencyStats = append(targetIPLatencyStats, entry) } diff --git a/pkg/apis/stats/v1alpha1/generated.proto b/pkg/apis/stats/v1alpha1/generated.proto index 2b87ca0567c..6c6098a8569 100644 --- a/pkg/apis/stats/v1alpha1/generated.proto +++ b/pkg/apis/stats/v1alpha1/generated.proto @@ -98,7 +98,7 @@ message NetworkPolicyStatsList { repeated NetworkPolicyStats items = 2; } -// NodeLatencyStats contains the latency stat of a Node. +// NodeLatencyStats contains all the latency measurements collected by the Agent from a specific Node. message NodeLatencyStats { optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; diff --git a/pkg/apis/stats/v1alpha1/types.go b/pkg/apis/stats/v1alpha1/types.go index b152d14474b..416f6070ba2 100644 --- a/pkg/apis/stats/v1alpha1/types.go +++ b/pkg/apis/stats/v1alpha1/types.go @@ -153,7 +153,7 @@ type RuleTrafficStats struct { // +genclient:onlyVerbs=create,delete,get,list,watch // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// NodeLatencyStats contains the latency stat of a Node. +// NodeLatencyStats contains all the latency measurements collected by the Agent from a specific Node. type NodeLatencyStats struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go index 20e7e346d5c..4ec7d6b2ab1 100644 --- a/pkg/apiserver/openapi/zz_generated.openapi.go +++ b/pkg/apiserver/openapi/zz_generated.openapi.go @@ -6681,7 +6681,7 @@ func schema_pkg_apis_stats_v1alpha1_NodeLatencyStats(ref common.ReferenceCallbac return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "NodeLatencyStats contains the latency stat of a Node.", + Description: "NodeLatencyStats contains all the latency measurements collected by the Agent from a specific Node.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": {