From f4d1e092bed0cb92e4487532963a25f6a3acbb13 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Mon, 5 Feb 2024 18:45:33 +0100 Subject: [PATCH] Readded quickwit projects in CI (#4514) * Readded quickwit projects in CI ... and fixing bug that was breaking CI * Update quickwit/Cargo.toml Co-authored-by: trinity-1686a --------- Co-authored-by: trinity-1686a --- quickwit/Cargo.toml | 31 ++++++++++++++++++- .../quickwit-ingest/src/ingest_v2/state.rs | 2 +- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 99251d2b4b4..217bca439a3 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -36,9 +36,38 @@ members = [ "quickwit-telemetry", ] default-members = [ + "quickwit-actors", + "quickwit-aws", "quickwit-cli", + "quickwit-cluster", + "quickwit-codegen", + "quickwit-codegen/example", + "quickwit-common", + "quickwit-config", + "quickwit-control-plane", + "quickwit-index-management", + "quickwit-datetime", + "quickwit-directories", + "quickwit-doc-mapper", "quickwit-indexing", - "quickwit-metastore" + "quickwit-ingest", + "quickwit-integration-tests", + "quickwit-jaeger", + "quickwit-janitor", + "quickwit-macros", + "quickwit-macros/impl", + "quickwit-metastore", + # Disabling metastore-utils from the quickwit projects to ease build/deps. + # We can reenable it when we need it. + # "quickwit-metastore-utils", + "quickwit-opentelemetry", + "quickwit-proto", + "quickwit-query", + "quickwit-rest-client", + "quickwit-search", + "quickwit-serve", + "quickwit-storage", + "quickwit-telemetry", ] [profile.dev] diff --git a/quickwit/quickwit-ingest/src/ingest_v2/state.rs b/quickwit/quickwit-ingest/src/ingest_v2/state.rs index 80b6baa46f9..eb5b56c0447 100644 --- a/quickwit/quickwit-ingest/src/ingest_v2/state.rs +++ b/quickwit/quickwit-ingest/src/ingest_v2/state.rs @@ -186,7 +186,7 @@ impl FullyLockedIngesterState<'_> { /// mrecordlog queue first and then removes the associated in-memory shard and rate trackers. pub async fn delete_shard(&mut self, queue_id: &QueueId) { // This if-statement is here to avoid needless log. - if self.inner.shards.contains_key(queue_id) { + if !self.inner.shards.contains_key(queue_id) { // No need to do anything. This queue is not on this ingester. return; }