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

VReplication: Get workflowFlavorVtctl endtoend testing working properly again #15636

Merged
merged 3 commits into from
Apr 4, 2024

Conversation

mattlord
Copy link
Contributor

@mattlord mattlord commented Apr 3, 2024

Description

After #15579 the tests that used functions in the resharding_workflows_v2_test file (primarily tstWorkflowExec()) and supported two client flavors — vtctl[client] and vtctld[client], doing both or choosing one randomly — were really using vtctldclient in both cases.

And when the flavor was vtctl[client] — both before AND after #15579 — some of the tests failed every time as they did not properly set the currentWorkflowType to MoveTables so the command did a Reshard instead as that's the default. For example, I noticed that the TestFKWorkflow test (which is executed in the vreplication_cellalias workflow) failed every time that the flavor was vtctl (the flavor being chosen randomly in that test). This was papered over by our auto retry and the fact that these workflows completed pretty quickly. You can see that test and workflow passing in this PR with the flavor being vtctl and vtctld here (run 11 times in a row): https://github.com/vitessio/vitess/actions/runs/8546382449/job/23416629462?pr=15636

This PR corrects both issues so that these tests are properly testing both flavors as expected.

I wanted to backport this to back to v18 as that's where #15579 was backported to, and these are ONLY test/CI changes.

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

Copy link
Contributor

vitess-bot bot commented Apr 3, 2024

Review Checklist

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

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

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

Backward compatibility

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

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Apr 3, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone Apr 3, 2024
@mattlord mattlord added Backport to: release-18.0 Backport to: release-19.0 Needs to be back ported to release-19.0 and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Apr 3, 2024
Copy link

codecov bot commented Apr 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.13%. Comparing base (0e2f175) to head (7af9b8b).
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #15636   +/-   ##
=======================================
  Coverage   68.13%   68.13%           
=======================================
  Files        1556     1556           
  Lines      194984   194984           
=======================================
+ Hits       132849   132856    +7     
+ Misses      62135    62128    -7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mattlord mattlord marked this pull request as ready for review April 3, 2024 22:53
@mattlord mattlord requested a review from deepthi as a code owner April 3, 2024 22:53
@mattlord mattlord requested a review from rohit-nayak-ps April 3, 2024 22:53
// tstWorkflowExecVtctl executes a MoveTables or Reshard workflow command using
// vtctlclient. It should operate exactly the same way as tstWorkflowExec, but
// using the legacy client.
func tstWorkflowExecVtctl(t *testing.T, cells, workflow, sourceKs, targetKs, tables, action, tabletTypes,
Copy link
Contributor Author

@mattlord mattlord Apr 4, 2024

Choose a reason for hiding this comment

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

This is a copy of what tstWorkflowExec() was prior to #15579

@systay systay mentioned this pull request Apr 4, 2024
21 tasks
@shlomi-noach shlomi-noach mentioned this pull request Apr 4, 2024
17 tasks
@systay systay mentioned this pull request Apr 4, 2024
20 tasks
@deepthi deepthi merged commit 4a1870a into vitessio:main Apr 4, 2024
103 checks passed
mattlord pushed a commit that referenced this pull request Apr 4, 2024
… working properly again (#15636) (#15667)

Signed-off-by: Matt Lord <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
mattlord added a commit that referenced this pull request Apr 4, 2024
… working properly again (#15636) (#15666)

Signed-off-by: Matt Lord <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Lord <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants