Skip to content
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.

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

fix(ci): re-enable kill-meta in deterministic simulation test #18795

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 18 additions & 48 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ sea-orm = { version = "0.12.15", features = [
"sqlx-sqlite",
"runtime-tokio-native-tls",
] }
sqlx = { version = "0.7.3", default-features = false, features = [
sqlx = { version = "0.7.4", default-features = false, features = [
"bigdecimal",
"chrono",
"json",
Expand Down Expand Up @@ -353,7 +353,7 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev =
# NOTE(kwannoel): patch sqlx to use a version compatible with madsim.
# If we can merge in: https://github.com/madsim-rs/sqlx/pull/2,
# we can change it to patch madsim version instead.
sqlx = { git = "https://github.com/kwannoel/sqlx.git", rev = "5a32ad8ce842176c202df30910e1416655eda071" }
sqlx = { git = "https://github.com/kwannoel/sqlx.git", rev = "15ee4ba0eedc269540e42c6b4437c10de7325ed7" }
futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" }
# patch to remove preserve_order from serde_json
bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" }
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/deterministic-recovery-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ filter_stack_trace_for_all_logs() {
done
}

trap filter_stack_trace_for_all_logs ERR
# trap filter_stack_trace_for_all_logs ERR
Copy link
Member

Choose a reason for hiding this comment

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

Why?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

filter_stack_trace_for_all_logs accidentally removes some useful stacktrace from madsim.

But without it, the stacktrace dump in the log file is really large, and makes the file size few hundred MB to 1GB+ previously.

So I temporarily disable it here. This change won't be merged in.


# NOTE(kwannoel): We must use `export` here, because the variables are not substituted
# directly via bash subtitution. Instead, the `parallel` command substitutes the variables
Expand Down
2 changes: 1 addition & 1 deletion src/tests/simulation/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ async fn main() {
..Default::default()
};
let kill_opts = KillOpts {
kill_meta: false,
kill_meta: args.kill_meta || args.kill,
kill_frontend: args.kill_frontend || args.kill,
kill_compute: args.kill_compute || args.kill,
kill_compactor: args.kill_compactor || args.kill,
Expand Down
Loading