Skip to content

Fix coverage tests #5735

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

Merged
merged 2 commits into from
Apr 30, 2025
Merged

Fix coverage tests #5735

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
ba1eb20
Fix failpoint test on merge cancelling
rdettai Apr 7, 2025
c22b22a
Fix missing sandbox shutdown
rdettai Apr 8, 2025
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
12 changes: 6 additions & 6 deletions quickwit/quickwit-indexing/failpoints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ use std::sync::{Arc, Barrier, Mutex};
use std::time::Duration;

use fail::FailScenario;
use quickwit_actors::ActorExitStatus;
use quickwit_common::io::IoControls;
use quickwit_common::rand::append_random_suffix;
use quickwit_common::split_file;
Expand Down Expand Up @@ -310,7 +309,7 @@ async fn test_merge_executor_controlled_directory_kill_switch() -> anyhow::Resul
merge_packager_mailbox,
);

let (merge_executor_mailbox, merge_executor_handle) =
let (merge_executor_mailbox, _merge_executor_handle) =
universe.spawn_builder().spawn(merge_executor);

// We want to make sure that the processing of the message gets
Expand All @@ -334,14 +333,15 @@ async fn test_merge_executor_controlled_directory_kill_switch() -> anyhow::Resul
after_universe_kill_clone.wait();
})
.unwrap();
fail::cfg(
"after-merge-split",
"panic(merge should be failed by directory kill switch)",
)
.unwrap();
merge_executor_mailbox.send_message(merge_scratch).await?;
before_universe_kill.wait();
universe.kill();
after_universe_kill.wait();
fail::cfg("before-merge-split", "off").unwrap();

let (exit_status, _) = merge_executor_handle.join().await;
assert!(matches!(exit_status, ActorExitStatus::Failure(_)));
Comment on lines +336 to -344
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fulmicoton-dd I know you wrote this a long time ago, but do you happen to remember why you were testing the merge_executor_handle.join() result instead of using a panic failpoint?

Note: the actor exit status is now Killed instead of Failure because since #5704, merge failures return Ok() with an error!. log instead of failing the actor. But this is not what this test is about, hence the proposed change.

universe.quit().await;

Ok(())
Expand Down
2 changes: 2 additions & 0 deletions quickwit/quickwit-integration-tests/src/tests/tls_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ async fn test_tls_rest() {
.len(),
0
);

sandbox.shutdown().await.unwrap();
}

#[tokio::test]
Expand Down