Updating chitchat (#5505)

quickwit-oss · Oct 22, 2024 · a49f5c4 · a49f5c4
1 parent 5e5b360
commit a49f5c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
@@ -89,7 +89,7 @@ base64 = "0.22"
 bytes = { version = "1", features = ["serde"] }
 bytesize = { version = "1.3.0", features = ["serde"] }
 bytestring = "1.3.0"
-chitchat = { git = "https://github.com/quickwit-oss/chitchat.git", rev = "d039699" }
+chitchat = { git = "https://github.com/quickwit-oss/chitchat.git", rev = "54cbc70" }
 chrono = { version = "0.4", default-features = false, features = [
   "clock",
   "std",

diff --git a/quickwit/quickwit-cluster/src/cluster.rs b/quickwit/quickwit-cluster/src/cluster.rs
@@ -779,10 +779,9 @@ mod tests {
 
         let self_node_state = cluster_snapshot
             .chitchat_state_snapshot
-            .node_state_snapshots
+            .node_states
             .into_iter()
-            .find(|node_state_snapshot| node_state_snapshot.chitchat_id == node.self_chitchat_id)
-            .map(|node_state_snapshot| node_state_snapshot.node_state)
+            .find(|node_state| node_state.chitchat_id() == &node.self_chitchat_id)
             .unwrap();
         assert_eq!(
             self_node_state.get(READINESS_KEY).unwrap(),
@@ -800,10 +799,9 @@ mod tests {
 
         let self_node_state = cluster_snapshot
             .chitchat_state_snapshot
-            .node_state_snapshots
+            .node_states
             .into_iter()
-            .find(|node_state_snapshot| node_state_snapshot.chitchat_id == node.self_chitchat_id)
-            .map(|node_state_snapshot| node_state_snapshot.node_state)
+            .find(|node_state| node_state.chitchat_id() == &node.self_chitchat_id)
             .unwrap();
         assert_eq!(
             self_node_state.get(READINESS_KEY).unwrap(),
@@ -821,10 +819,9 @@ mod tests {
 
         let self_node_state = cluster_snapshot
             .chitchat_state_snapshot
-            .node_state_snapshots
+            .node_states
             .into_iter()
-            .find(|node_state_snapshot| node_state_snapshot.chitchat_id == node.self_chitchat_id)
-            .map(|node_state_snapshot| node_state_snapshot.node_state)
+            .find(|node_state| node_state.chitchat_id() == &node.self_chitchat_id)
             .unwrap();
         assert_eq!(
             self_node_state.get(READINESS_KEY).unwrap(),

diff --git a/quickwit/quickwit-serve/src/developer_api/server.rs b/quickwit/quickwit-serve/src/developer_api/server.rs
@@ -89,7 +89,7 @@ impl DeveloperService for DeveloperApiServer {
                 "ready_nodes": cluster_snapshot.ready_nodes,
                 "live_nodes": cluster_snapshot.live_nodes,
                 "dead_nodes": cluster_snapshot.dead_nodes,
-                "chitchat_state": cluster_snapshot.chitchat_state_snapshot.node_state_snapshots,
+                "chitchat_state": cluster_snapshot.chitchat_state_snapshot.node_states,
             })
         });
         if let Some(control_plane_mailbox) = &self.control_plane_mailbox_opt {