optimize logic

Signed-off-by: 923048992@qq.com <923048992@qq.com>

Author: Okabe-Rintarou-0

bpf/kmesh/ads/include/circuit_breaker.h

@@ -42,10 +42,10 @@ struct {
 
 static inline void update_cluster_active_connections(const struct cluster_stats_key *key, int delta)
 {
+    struct cluster_stats *stats = NULL;
     if (!key) {
         return;
     }
-    struct cluster_stats *stats = NULL;
     stats = kmesh_map_lookup_elem(&map_of_cluster_stats, key);
     if (!stats) {
         struct cluster_stats init_value = {0};
@@ -67,7 +67,8 @@ static inline void update_cluster_active_connections(const struct cluster_stats_
     BPF_LOG(
         DEBUG,
         CIRCUIT_BREAKER,
-        "update existing stats(netns_cookie = %lld, cluster_id = %ld), current active connections: %d",
+        "update existing stats(netns_cookie = %lld, cluster_id = %ld), "
+        "current active connections: %d",
         key->netns_cookie,
         key->cluster_id,
         stats->active_connections);
@@ -90,7 +91,8 @@ static inline int on_cluster_sock_bind(ctx_buff_t *ctx, const Cluster__Cluster *
             BPF_LOG(
                 DEBUG,
                 CIRCUIT_BREAKER,
-                "Current active connections %d exceeded max connections %d, reject connection",
+                "Current active connections %d exceeded max connections "
+                "%d, reject connection",
                 stats->active_connections,
                 cbs->max_connections);
             return -1;
@@ -141,7 +143,8 @@ static inline void on_cluster_sock_connect(struct bpf_sock_ops *ctx)
     BPF_LOG(
         DEBUG,
         CIRCUIT_BREAKER,
-        "increase cluster active connections(netns_cookie = %lld, cluster id = %ld)",
+        "increase cluster active connections(netns_cookie = %lld, cluster "
+        "id = %ld)",
         key.netns_cookie,
         key.cluster_id);
     update_cluster_active_connections(&key, 1);
@@ -165,7 +168,8 @@ static inline void on_cluster_sock_close(struct bpf_sock_ops *ctx)
     BPF_LOG(
         DEBUG,
         CIRCUIT_BREAKER,
-        "decrease cluster active connections(netns_cookie = %lld, cluster id = %ld)",
+        "decrease cluster active connections(netns_cookie = %lld, cluster "
+        "id = %ld)",
         key.netns_cookie,
         key.cluster_id);
     BPF_LOG(DEBUG, CIRCUIT_BREAKER, "record sock close for cluster id = %ld", data->cluster_id);

bpf/kmesh/ads/include/config.h

@@ -46,6 +46,7 @@
 #define map_of_virtual_host   kmesh_virtual_host
 #define map_of_route          kmesh_route
 #define map_of_cluster        kmesh_cluster
+#define map_of_cluster_stats  kmesh_cluster_stats
 #define map_of_loadbalance    kmesh_loadbalance
 #define map_of_endpoint       kmesh_endpoint
 #define map_of_tail_call_prog kmesh_tail_call_prog

bpf/kmesh/ads/include/kmesh_common.h

@@ -71,31 +71,6 @@ static inline char *bpf_strncpy(char *dst, int n, const char *src)
 }
 #endif
 
-struct {
-    __uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
-    __uint(key_size, sizeof(__u32));
-    __uint(value_size, sizeof(__u32));
-    __uint(max_entries, MAP_SIZE_OF_OUTTER_MAP);
-    __uint(map_flags, 0);
-} outer_map SEC(".maps");
-
-struct {
-    __uint(type, BPF_MAP_TYPE_ARRAY);
-    __uint(key_size, sizeof(__u32));
-    __uint(value_size, BPF_INNER_MAP_DATA_LEN);
-    __uint(max_entries, 1);
-    __uint(map_flags, 0);
-} inner_map SEC(".maps");
-
-typedef enum {
-    KMESH_TAIL_CALL_LISTENER = 1,
-    KMESH_TAIL_CALL_FILTER_CHAIN,
-    KMESH_TAIL_CALL_FILTER,
-    KMESH_TAIL_CALL_ROUTER,
-    KMESH_TAIL_CALL_CLUSTER,
-    KMESH_TAIL_CALL_ROUTER_CONFIG,
-} tail_call_index_t;
-
 typedef Core__SocketAddress address_t;
 
 // bpf return value

pkg/bpf/ads/loader.go

@@ -142,7 +142,7 @@ func (sc *BpfAds) Detach() error {
 }
 
 func (sc *BpfAds) GetClusterStatsMap() *ebpf.Map {
-	return nil
+	return sc.SockConn.KmeshCgroupSockMaps.KmeshClusterStats
 }
 
 func AdsL7Enabled() bool {

pkg/bpf/ads/loader_enhanced.go

@@ -186,7 +186,7 @@ func (sc *BpfAds) Detach() error {
 }
 
 func (sc *BpfAds) GetClusterStatsMap() *ebpf.Map {
-	return sc.SockOps.KmeshSockopsMaps.MapOfClusterStats
+	return sc.SockOps.KmeshSockopsMaps.KmeshClusterStats
 }
 
 func AdsL7Enabled() bool {