Skip to content

Use generation ID for routing table entries, and react to the ingester pool #6791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nadav-govari wants to merge 2 commits into
base: main
Choose a base branch
from
+407 −33
Open

Use generation ID for routing table entries, and react to the ingester pool #6791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b6628a
Gen Id
nadav-govari Sep 8, 2026
6fae0c7
Tests
nadav-govari Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions quickwit/quickwit-control-plane/src/control_plane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1782,6 +1782,7 @@ mod tests {
client: IngesterServiceClient::from_mock(mock_retiring_ingester),
status: IngesterStatus::Retiring,
availability_zone: None,
generation_id: quickwit_cluster::GenerationId::from(1u64),
},
);
ingester_pool.insert(
Expand Down
4 changes: 4 additions & 0 deletions quickwit/quickwit-control-plane/src/ingest/ingest_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,6 +1678,7 @@ mod tests {
client: IngesterServiceClient::mocked(),
status: IngesterStatus::Retiring,
availability_zone: None,
generation_id: quickwit_cluster::GenerationId::from(1u64),
},
);
let open_shard_opt =
Expand Down Expand Up @@ -3482,6 +3483,7 @@ mod tests {
client: ingester_client.clone(),
status: IngesterStatus::Ready,
availability_zone: None,
generation_id: quickwit_cluster::GenerationId::from(1u64),
};
ingester_pool.insert(NodeId::from_str(ingester_id), ingester);
}
Expand All @@ -3499,6 +3501,7 @@ mod tests {
client: ingester_client.clone(),
status: IngesterStatus::Retiring,
availability_zone: None,
generation_id: quickwit_cluster::GenerationId::from(1u64),
};
ingester_pool.insert(NodeId::from_str(ingester_id), ingester);
}
Expand Down Expand Up @@ -3640,6 +3643,7 @@ mod tests {
client: ingester_client.clone(),
status: IngesterStatus::Decommissioned,
availability_zone: None,
generation_id: quickwit_cluster::GenerationId::from(1u64),
};
ingester_pool.insert(NodeId::from_str(ingester_id), ingester);
}
Expand Down
6 changes: 5 additions & 1 deletion quickwit/quickwit-ingest/src/ingest_v2/broadcast/capacity_score.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::collections::BTreeSet;

use anyhow::{Context, Result};
use bytesize::ByteSize;
use quickwit_cluster::{Cluster, ListenerHandle};
use quickwit_cluster::{Cluster, GenerationId, ListenerHandle};
use quickwit_common::pubsub::{Event, EventBroker};
use quickwit_common::shared_consts::INGESTER_CAPACITY_SCORE_PREFIX;
use quickwit_proto::ingest::ingester::IngesterStatus;
Expand Down Expand Up @@ -160,6 +160,7 @@ impl BroadcastIngesterCapacityScoreTask {
#[derive(Debug, Clone)]
pub struct IngesterCapacityScoreUpdate {
pub node_id: NodeId,
pub generation_id: GenerationId,
pub source_uid: SourceUid,
pub capacity_score: usize,
pub open_shard_count: usize,
Expand All @@ -183,8 +184,10 @@ pub async fn setup_ingester_capacity_update_listener(
return;
};
let node_id: NodeId = NodeId::from_str(&event.node.node_id);
let generation_id: GenerationId = GenerationId::from(event.node.generation_id);
event_broker.publish(IngesterCapacityScoreUpdate {
node_id,
generation_id,
source_uid,
capacity_score: ingester_capacity.capacity_score,
open_shard_count: ingester_capacity.open_shard_count,
Expand Down Expand Up @@ -267,6 +270,7 @@ mod tests {
assert_eq!(event.source_uid.source_id, "test-source");
assert_eq!(event.capacity_score, 6);
assert_eq!(event.open_shard_count, 1);
assert_eq!(event.generation_id, GenerationId::from(1u64));
});

let _listener =
Expand Down
4 changes: 4 additions & 0 deletions quickwit/quickwit-ingest/src/ingest_v2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pub use broadcast::{
use bytes::buf::Writer;
use bytes::{BufMut, BytesMut};
use bytesize::ByteSize;
use quickwit_cluster::GenerationId;
use quickwit_common::tower::Pool;
use quickwit_proto::ingest::ingester::{IngesterServiceClient, IngesterStatus};
use quickwit_proto::ingest::router::{IngestRequestV2, IngestSubrequest};
Expand Down Expand Up @@ -71,6 +72,7 @@ pub struct IngesterPoolEntry {
pub client: IngesterServiceClient,
pub status: IngesterStatus,
pub availability_zone: Option<String>,
pub generation_id: GenerationId,
}

impl IngesterPoolEntry {
Expand All @@ -80,6 +82,7 @@ impl IngesterPoolEntry {
client,
status: IngesterStatus::Ready,
availability_zone: None,
generation_id: GenerationId::from(1u64),
}
}

Expand All @@ -89,6 +92,7 @@ impl IngesterPoolEntry {
client: IngesterServiceClient::mocked(),
status: IngesterStatus::Ready,
availability_zone: None,
generation_id: GenerationId::from(1u64),
}
}
}
Expand Down
Loading
Loading