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.

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

Jump to bottom

consolidating OnlineDDL 'singleton' tests into 'scheduler' tests: part 1 #12055

Merged
merged 3 commits into from
Jan 10, 2023
Merged

consolidating OnlineDDL 'singleton' tests into 'scheduler' tests: part 1 #12055

merged 3 commits into from
Jan 10, 2023

Conversation

shlomi-noach
Copy link
Contributor

Description

Following up on the discussion on #11988 (comment)

In this PR we copy all onlineddl_singleton tests into onlineddl_scheduler. A bit of refactoring was required to adapt to the subtle differences between the two.

The objective is to reduce the number of CI workflows.

Once this PR is merged, we will follow up in a next PR that completely removes onlineddl_singleton from the code base.

Related Issue(s)

#6926

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Documentation was added or is not required

Deployment Notes

@shlomi-noach
consolidating OnlineDDL 'singularity' tests into 'scheduler' tests
cadb4d6 
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach shlomi-noach requested a review from mattlord January 9, 2023 14:46
@vitess-bot
Copy link
Contributor

vitess-bot bot commented Jan 9, 2023 •
edited by deepthi
Loading

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • If this is a change that users need to know about, please apply the release notes (needs details) label so that merging is blocked unless the summary release notes document is included.
  • If a test is added or modified, there should be a documentation on top of the test to explain what the expected behavior is what the test does.

If a new flag is being introduced:

  • Is it really necessary to add this flag?
  • Flag names should be clear and intuitive (as far as possible)
  • Help text should be descriptive.
  • Flag names should use dashes (-) as word separators rather than underscores (_).

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow should be required, the maintainer team should be notified.

Bug fixes

  • There should be at least one unit or end-to-end test.
  • The Pull Request description should include a link to an issue that describes the bug.

Non-trivial changes

  • There should be some code comments as to why things are implemented the way they are.

New/Existing features

  • Should be documented, either by modifying the existing documentation or creating new documentation.
  • New features should have a link to a feature request issue or an RFC that documents the use cases, corner cases and test cases.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • vtctl command output order should be stable and awk-able.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from VTop, if used there.

@shlomi-noach shlomi-noach mentioned this pull request Jan 9, 2023
Merged
3 tasks
mattlord
mattlord approved these changes Jan 9, 2023
View reviewed changes
Copy link
Contributor

@mattlord mattlord left a comment

Choose a reason for hiding this comment

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

Thanks! ❤️

go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go Outdated
Comment on lines 833 to 834
// func testOnlineDDLStatement(t *testing.T, ddlStatement string, ddlStrategy string, executeStrategy string, expectHint string, expectError string, skipWait bool) (uuid string) {
// func testOnlineDDLStatement(t *testing.T, alterStatement string, ddlStrategy string, executeStrategy string, migrationContext string, expectHint string, expectError string, skipWait bool) (uuid string) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit, but we should remove these I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

whoops. removed.

@shlomi-noach
cleanup
96a38e4 
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
deepthi
deepthi approved these changes Jan 9, 2023
View reviewed changes
Copy link
Member

@deepthi deepthi left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I would have preferred the removal of singleton tests to happen in the same PR, but this is ok for now.

@deepthi deepthi changed the title consolidating OnlineDDL 'singularity' tests into 'scheduler' tests: part 1 consolidating OnlineDDL 'singleton' tests into 'scheduler' tests: part 1 Jan 9, 2023
@shlomi-noach
merge main, resolve conflict
4eb6e0a 
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach
Copy link
Contributor Author

I would have preferred the removal of singleton tests to happen in the same PR, but this is ok for now.

@deepthi the problem I see with that is a limbo between the singularity endtoend file existing/not existing, and project settings->protected branches->required tests existing/not existing. Some open branches may get confused by this?

@shlomi-noach shlomi-noach merged commit 673573a into vitessio:main Jan 10, 2023
@shlomi-noach shlomi-noach deleted the onlineddl-consolidate-singleton-tests branch January 10, 2023 10:13
@shlomi-noach shlomi-noach mentioned this pull request Jan 10, 2023
Merged
3 tasks
@shlomi-noach
Copy link
Contributor Author

similar: #12061

@shlomi-noach shlomi-noach mentioned this pull request Jan 29, 2023
Merged
3 tasks
@shlomi-noach
Copy link
Contributor Author

Followup in #12182

@shlomi-noach shlomi-noach mentioned this pull request Jan 29, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deepthi deepthi deepthi approved these changes

@mattlord mattlord mattlord approved these changes

@rohit-nayak-ps rohit-nayak-ps Awaiting requested review from rohit-nayak-ps rohit-nayak-ps is a code owner

Assignees
No one assigned
Labels
Component: Build/CI Type: Testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shlomi-noach @deepthi @mattlord