Skip to content

Commit a49f5c4

Browse files
authored
Updating chitchat (#5505)
1 parent 5e5b360 commit a49f5c4

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

quickwit/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ base64 = "0.22"
8989
bytes = { version = "1", features = ["serde"] }
9090
bytesize = { version = "1.3.0", features = ["serde"] }
9191
bytestring = "1.3.0"
92-
chitchat = { git = "https://github.com/quickwit-oss/chitchat.git", rev = "d039699" }
92+
chitchat = { git = "https://github.com/quickwit-oss/chitchat.git", rev = "54cbc70" }
9393
chrono = { version = "0.4", default-features = false, features = [
9494
"clock",
9595
"std",

quickwit/quickwit-cluster/src/cluster.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -779,10 +779,9 @@ mod tests {
779779

780780
let self_node_state = cluster_snapshot
781781
.chitchat_state_snapshot
782-
.node_state_snapshots
782+
.node_states
783783
.into_iter()
784-
.find(|node_state_snapshot| node_state_snapshot.chitchat_id == node.self_chitchat_id)
785-
.map(|node_state_snapshot| node_state_snapshot.node_state)
784+
.find(|node_state| node_state.chitchat_id() == &node.self_chitchat_id)
786785
.unwrap();
787786
assert_eq!(
788787
self_node_state.get(READINESS_KEY).unwrap(),
@@ -800,10 +799,9 @@ mod tests {
800799

801800
let self_node_state = cluster_snapshot
802801
.chitchat_state_snapshot
803-
.node_state_snapshots
802+
.node_states
804803
.into_iter()
805-
.find(|node_state_snapshot| node_state_snapshot.chitchat_id == node.self_chitchat_id)
806-
.map(|node_state_snapshot| node_state_snapshot.node_state)
804+
.find(|node_state| node_state.chitchat_id() == &node.self_chitchat_id)
807805
.unwrap();
808806
assert_eq!(
809807
self_node_state.get(READINESS_KEY).unwrap(),
@@ -821,10 +819,9 @@ mod tests {
821819

822820
let self_node_state = cluster_snapshot
823821
.chitchat_state_snapshot
824-
.node_state_snapshots
822+
.node_states
825823
.into_iter()
826-
.find(|node_state_snapshot| node_state_snapshot.chitchat_id == node.self_chitchat_id)
827-
.map(|node_state_snapshot| node_state_snapshot.node_state)
824+
.find(|node_state| node_state.chitchat_id() == &node.self_chitchat_id)
828825
.unwrap();
829826
assert_eq!(
830827
self_node_state.get(READINESS_KEY).unwrap(),

quickwit/quickwit-serve/src/developer_api/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl DeveloperService for DeveloperApiServer {
8989
"ready_nodes": cluster_snapshot.ready_nodes,
9090
"live_nodes": cluster_snapshot.live_nodes,
9191
"dead_nodes": cluster_snapshot.dead_nodes,
92-
"chitchat_state": cluster_snapshot.chitchat_state_snapshot.node_state_snapshots,
92+
"chitchat_state": cluster_snapshot.chitchat_state_snapshot.node_states,
9393
})
9494
});
9595
if let Some(control_plane_mailbox) = &self.control_plane_mailbox_opt {

0 commit comments

Comments
 (0)