snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-31 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5121
Some checks failed
Test suite / Tests on ${{ matrix.os }} (macos-13) (push) Waiting to run
Test suite / Tests almost all features (push) Has been skipped
Test suite / Test disabled tokenization (push) Has been skipped
Test suite / Tests on ubuntu-20.04 (push) Failing after 11s
Test suite / Run tests in debug (push) Failing after 9s
Test suite / Tests on ${{ matrix.os }} (windows-2022) (push) Failing after 24s
Test suite / Run Rustfmt (push) Successful in 1m19s
Test suite / Run Clippy (push) Successful in 5m32s

Browse Source 
5121: Make the tasks pulling timeout configurable r=dureuill a=Kerollmops



Co-authored-by: Kerollmops <clement@meilisearch.com>
This commit is contained in:
meili-bors[bot]
2024-12-04 17:04:14 +00:00
committed by GitHub
parent b7eb802ae6 d0c4e6da6b
commit a003a0934a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/xtask/src/bench/mod.rs
View File

@@ -82,6 +82,10 @@ pub struct BenchDeriveArgs {
/// Reason for the benchmark invocation /// Reason for the benchmark invocation
#[arg(short, long)] #[arg(short, long)]
reason: Option<String>, reason: Option<String>,
/// The maximum time in seconds we allow for fetching the task queue before timing out.
#[arg(long, default_value_t = 60)]
tasks_queue_timeout_secs: u64,
} }
pub fn run(args: BenchDeriveArgs) -> anyhow::Result<()> { pub fn run(args: BenchDeriveArgs) -> anyhow::Result<()> {
@@ -127,7 +131,7 @@ pub fn run(args: BenchDeriveArgs) -> anyhow::Result<()> {
let meili_client = Client::new( let meili_client = Client::new(
Some("http://127.0.0.1:7700".into()), Some("http://127.0.0.1:7700".into()),
args.master_key.as_deref(), args.master_key.as_deref(),
Some(std::time::Duration::from_secs(60)), Some(std::time::Duration::from_secs(args.tasks_queue_timeout_secs)),
)?; )?;
// enter runtime // enter runtime

1
crates/xtask/src/main.rs
View File

@@ -16,6 +16,7 @@ struct ListFeaturesDeriveArgs {
#[command(author, version, about, long_about)] #[command(author, version, about, long_about)]
#[command(name = "cargo xtask")] #[command(name = "cargo xtask")]
#[command(bin_name = "cargo xtask")] #[command(bin_name = "cargo xtask")]
#[allow(clippy::large_enum_variant)] // please, that's enough...
enum Command { enum Command {
ListFeatures(ListFeaturesDeriveArgs), ListFeatures(ListFeaturesDeriveArgs),
Bench(BenchDeriveArgs), Bench(BenchDeriveArgs),