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): fix there is no reactor running in meta recovery tests, when kill-meta enabled #18852

Merged
merged 4 commits into from
Oct 11, 2024

Conversation

kwannoel
Copy link
Contributor

@kwannoel kwannoel commented Oct 11, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Apply patch: madsim-rs/madsim#231 which fixes an upstream bug: madsim-rs/madsim#228.

This patch fixes madsim-sqlx's drop on spawn error, and fixes one of the bugs in the meta recovery tests.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@@ -354,6 +354,7 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev =
# 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 = "ddf222f56cf99f865231a5383053645c6ea05ba3" }
madsim = { git = "https://github.com/madsim-rs/madsim.git", rev = "f0ffd24864245aea236833f1ff3638f75bd51700" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can remove once madsim-rs/madsim#231 merged.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@@ -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
Contributor Author

Choose a reason for hiding this comment

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

We can just remove the log filter, until recovery tests stabilize. The recent logs are < 1MB, and we only upload the zipped archive for the logs.

@kwannoel
Copy link
Contributor Author

kwannoel commented Oct 11, 2024

The original bug of reactor missing is no longer present. Instead we have other bugs. I have included them in this branch: #18855.

I will just disable kill-meta in this branch, then we can merge it in, as the original branch is fixed from the patch. Disabling kill-meta is required since there are still bugs that occur semi-frequently, so we don't want to block other's PR workflows.

@kwannoel kwannoel marked this pull request as ready for review October 11, 2024 03:16
@kwannoel kwannoel requested a review from a team as a code owner October 11, 2024 03:16
@kwannoel kwannoel requested a review from xiangjinwu October 11, 2024 03:16
@kwannoel kwannoel force-pushed the kwannoel/enable-kill-meta-v2 branch from 06f66b0 to 5c83d99 Compare October 11, 2024 03:17
@kwannoel kwannoel mentioned this pull request Oct 11, 2024
@kwannoel kwannoel changed the title fix(ci): re-enable kill meta fix(ci): fix there is no reactor running in meta recovery tests, when kill-meta enabled Oct 11, 2024
@graphite-app graphite-app bot requested a review from a team October 11, 2024 03:51
@BugenZhao
Copy link
Member

The original bug of reactor missing is no longer present.

Sounds good!

Copy link
Member

@yezizp2012 yezizp2012 left a comment

Choose a reason for hiding this comment

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

LGTM!

@kwannoel kwannoel force-pushed the kwannoel/enable-kill-meta-v2 branch from 5c83d99 to 930bb1c Compare October 11, 2024 05:09
@xiangjinwu xiangjinwu removed their request for review October 11, 2024 05:45
@kwannoel kwannoel added this pull request to the merge queue Oct 11, 2024
Merged via the queue into main with commit 7cd2ab0 Oct 11, 2024
30 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants