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

CI: fix issues related to [tokio::test]/[ntest::timeout] attributes and tablets with LWT #1011

Merged
merged 5 commits into from
Jun 13, 2024

Conversation

muzarski
Copy link
Contributor

@muzarski muzarski commented Jun 12, 2024

This PR fixes the issues with CI that happen lately.

Changes:

  • Printing rust tools' versions in CI. This might be helpful for future investigations in case of CI failures.
  • Put restrictions on tokio version. Bumped minimal version to 1.34. The version should be lower than 1.38, because of the issues with [tokio::test] and [ntest::timeout] attributes. Ref: regression: tokio::test in 1.38 eats my tests tokio-rs/tokio#6610. Remove this restriction once the issue is fixed.
  • Disabling tablets in tests that use LWT.
  • Marked test_lwt_optimization_works_with_tablets with #[ignore] (tests LWT + tablets).
  • Removed tablets.yml workflow, since tablets are stable in newest releases of Scylla - no need to create a separate job for tablets which creates a cluster with ccm.

Pre-review checklist

  • I have split my patch into logically separate commits.
  • All commit messages clearly explain what they change and why.
  • [ ] I added relevant tests for new features and bug fixes.
  • All commits compile, pass static checks and pass test.
  • PR description sums up the changes and reasons why they should be introduced.
  • [ ] I have provided docstrings for the public items that I want to introduce.
  • [ ] I have adjusted the documentation in ./docs/source/.
  • [ ] I added appropriate Fixes: annotations to PR description.

Copy link

github-actions bot commented Jun 12, 2024

cargo semver-checks found no API-breaking changes in this PR! 🎉🥳
Checked commit: 032fe2d

@muzarski muzarski force-pushed the toolchain_version branch from 9b97cde to 5e51b13 Compare June 12, 2024 10:03
@muzarski muzarski marked this pull request as draft June 12, 2024 10:34
@muzarski muzarski force-pushed the toolchain_version branch 2 times, most recently from 85e9a78 to 19b48f1 Compare June 12, 2024 11:31
@muzarski muzarski force-pushed the toolchain_version branch 2 times, most recently from a908f83 to 8d4fc81 Compare June 12, 2024 14:31
@muzarski muzarski marked this pull request as ready for review June 12, 2024 15:16
@muzarski muzarski force-pushed the toolchain_version branch from 8d4fc81 to 4060c7d Compare June 12, 2024 15:16
muzarski added 4 commits June 12, 2024 17:17
We decided to bump minimum required version of tokio to 1.34.

Currently, the newest tokio version is 1.38, but some of the integration
tests are eaten when testing with this specific verstion of tokio.
Which is why, as of now, we decided not to support this version.

The issue with version 1.38 is related
to #[tokio::test] and #[ntest::timeout] attributes.
Refs:
- tokio-rs/tokio#6610
- becheran/ntest#28
- tokio-rs/tokio#6497
As of now, LWTs are not supported with tablets enabled.
Marked the test for LWT + tablets with `#[ignore]`.
The separate job for tablets is not needed anymore, since tablets
are stable in newest release of Scylla.
@muzarski muzarski force-pushed the toolchain_version branch from 4060c7d to 032fe2d Compare June 12, 2024 15:17
@muzarski muzarski requested review from wprzytula and Lorak-mmk June 12, 2024 15:18
@muzarski muzarski self-assigned this Jun 12, 2024
Copy link
Collaborator

@Lorak-mmk Lorak-mmk left a comment

Choose a reason for hiding this comment

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

PR title is not correct. Please fix it before we merge this PR.

@muzarski muzarski changed the title CI: print versions of tools from rust toolchain CI: fix issues related to [tokio::test]/[ntest::timeout] attributes and tablets with LWT Jun 13, 2024
@muzarski
Copy link
Contributor Author

PR title is not correct. Please fix it before we merge this PR.

Done

@Lorak-mmk Lorak-mmk merged commit 3d3c353 into scylladb:main Jun 13, 2024
11 checks passed
@muzarski muzarski deleted the toolchain_version branch October 29, 2024 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants