create type ClusterHashes

sozu-proxy · Apr 28, 2023 · 2e26e76 · 2e26e76
1 parent ae140f2
commit 2e26e76
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/bin/src/command/requests.rs b/bin/src/command/requests.rs
@@ -18,9 +18,9 @@ use sozu_command_lib::{
     logging,
     parser::parse_several_commands,
     proto::command::{
-        request::RequestType, AggregatedMetrics, AvailableMetrics, FrontendFilters, ListenersList,
-        MetricsConfiguration, Request, ResponseStatus, ReturnListenSockets, RunState, SoftStop,
-        Status, WorkerInfo, WorkerInfos,
+        request::RequestType, AggregatedMetrics, AvailableMetrics, ClusterHashes, FrontendFilters,
+        ListenersList, MetricsConfiguration, Request, ResponseStatus, ReturnListenSockets,
+        RunState, SoftStop, Status, WorkerInfo, WorkerInfos,
     },
     request::WorkerRequest,
     response::{ListedFrontends, Response, ResponseContent},
@@ -1080,8 +1080,9 @@ impl CommandServer {
         let mut main_response_content = None;
         match &request.request_type {
             Some(RequestType::QueryClustersHashes(_)) => {
-                main_response_content =
-                    Some(ResponseContent::ClustersHashes(self.state.hash_state()));
+                main_response_content = Some(ResponseContent::ClustersHashes(ClusterHashes {
+                    map: self.state.hash_state(),
+                }));
             }
             Some(RequestType::QueryClusterById(cluster_id)) => {
                 main_response_content = Some(ResponseContent::Clusters(vec![self

diff --git a/bin/src/ctl/display.rs b/bin/src/ctl/display.rs
@@ -606,7 +606,7 @@ pub fn print_query_response_data(
         for metrics in data.values() {
             //let m: u8 = metrics;
             if let ResponseContent::ClustersHashes(clusters) = metrics {
-                for (key, value) in clusters.iter() {
+                for (key, value) in clusters.map.iter() {
                     query_data.entry(key).or_insert(Vec::new()).push(value);
                 }
             }

diff --git a/command/src/command.proto b/command/src/command.proto
@@ -401,6 +401,11 @@ enum EventKind {
     REMOVED_BACKEND_HAS_NO_CONNECTIONS = 3;
 }
 
+message ClusterHashes {
+    // cluster id -> hash of cluster information
+    map<string, uint64> map = 1;
+}
+
 enum ResponseStatus {
     OK = 0;
     PROCESSING = 1;

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -8,10 +8,10 @@ use std::{
 
 use crate::{
     proto::command::{
-        AddBackend, AggregatedMetrics, AvailableMetrics, CertificateSummary, Cluster, Event,
-        FilteredTimeSerie, ListenersList, LoadBalancingParams, PathRule, PathRuleKind,
-        RequestHttpFrontend, RequestTcpFrontend, ResponseStatus, RulePosition, RunState,
-        WorkerInfos, WorkerMetrics,
+        AddBackend, AggregatedMetrics, AvailableMetrics, CertificateSummary, Cluster,
+        ClusterHashes, Event, FilteredTimeSerie, ListenersList, LoadBalancingParams, PathRule,
+        PathRuleKind, RequestHttpFrontend, RequestTcpFrontend, ResponseStatus, RulePosition,
+        RunState, WorkerInfos, WorkerMetrics,
     },
     request::PROTOCOL_VERSION,
     state::ClusterId,
@@ -69,7 +69,7 @@ pub enum ResponseContent {
 
     Clusters(Vec<ClusterInformation>),
     /// cluster id -> hash of cluster information
-    ClustersHashes(BTreeMap<String, u64>),
+    ClustersHashes(ClusterHashes),
 
     /// a list of certificates for each socket address
     Certificates(HashMap<SocketAddr, Vec<CertificateSummary>>),

diff --git a/lib/src/server.rs b/lib/src/server.rs
@@ -17,9 +17,9 @@ use sozu_command::{
     channel::Channel,
     config::Config,
     proto::command::{
-        request::RequestType, ActivateListener, AddBackend, Cluster, DeactivateListener, Event,
-        HttpListenerConfig, HttpsListenerConfig, ListenerType, LoadBalancingAlgorithms, LoadMetric,
-        MetricsConfiguration, RemoveBackend, ResponseStatus,
+        request::RequestType, ActivateListener, AddBackend, Cluster, ClusterHashes,
+        DeactivateListener, Event, HttpListenerConfig, HttpsListenerConfig, ListenerType,
+        LoadBalancingAlgorithms, LoadMetric, MetricsConfiguration, RemoveBackend, ResponseStatus,
         TcpListenerConfig as CommandTcpListener,
     },
     ready::Ready,
@@ -882,7 +882,9 @@ impl Server {
             Some(RequestType::QueryClustersHashes(_)) => {
                 push_queue(WorkerResponse::ok_with_content(
                     message.id.clone(),
-                    ResponseContent::ClustersHashes(self.config_state.hash_state()),
+                    ResponseContent::ClustersHashes(ClusterHashes {
+                        map: self.config_state.hash_state(),
+                    }),
                 ));
                 return;
             }