diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6389653b262..f87cdf504a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: QW_TEST_DATABASE_URL: postgres://quickwit-dev:quickwit-dev@localhost:5432/quickwit-metastore-dev RUST_BACKTRACE: 1 RUSTDOCFLAGS: -Dwarnings -Arustdoc::private_intra_doc_links - RUSTFLAGS: -Dwarnings + RUSTFLAGS: "--cfg tokio_unstable -Dwarnings" # Ensures that we cancel running jobs for the same PR / same workflow. concurrency: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ef9422951ad..38b1fa39f7d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -21,6 +21,7 @@ env: QW_S3_ENDPOINT: "http://localhost:4566" # Services are exposed as localhost because we are not running coverage in a container. QW_S3_FORCE_PATH_STYLE_ACCESS: 1 QW_TEST_DATABASE_URL: postgres://quickwit-dev:quickwit-dev@localhost:5432/quickwit-metastore-dev + RUSTFLAGS: "--cfg tokio_unstable" jobs: test: diff --git a/Dockerfile b/Dockerfile index 796c6a421a1..7fab6042abd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,7 @@ COPY --from=ui-builder /quickwit/quickwit-ui/build /quickwit/quickwit-ui/build WORKDIR /quickwit +ENV RUSTFLAGS="--cfg tokio_unstable" RUN echo "Building workspace with feature(s) '$CARGO_FEATURES' and profile '$CARGO_PROFILE'" \ && cargo build \ -p quickwit-cli \ diff --git a/quickwit/.cargo/config.toml b/quickwit/.cargo/config.toml new file mode 100644 index 00000000000..bff29e6e175 --- /dev/null +++ b/quickwit/.cargo/config.toml @@ -0,0 +1,2 @@ +[build] +rustflags = ["--cfg", "tokio_unstable"] diff --git a/quickwit/quickwit-common/src/runtimes.rs b/quickwit/quickwit-common/src/runtimes.rs index be1e8ce16d0..06011955fd5 100644 --- a/quickwit/quickwit-common/src/runtimes.rs +++ b/quickwit/quickwit-common/src/runtimes.rs @@ -92,6 +92,7 @@ fn start_runtimes(config: RuntimesConfig) -> HashMap { format!("blocking-{id}") }) .enable_all() + .disable_lifo_slot() .build() .unwrap(); runtimes.insert(RuntimeType::Blocking, blocking_runtime); @@ -103,6 +104,7 @@ fn start_runtimes(config: RuntimesConfig) -> HashMap { format!("non-blocking-{id}") }) .enable_all() + .disable_lifo_slot() .build() .unwrap(); runtimes.insert(RuntimeType::NonBlocking, non_blocking_runtime);