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

[release-15.0] Enable failures in tools/e2e_test_race.sh and fix races (#13654) #14009

Merged
merged 2 commits into from
Oct 2, 2023
Merged

[release-15.0] Enable failures in tools/e2e_test_race.sh and fix races (#13654) #14009

merged 2 commits into from
Oct 2, 2023

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Sep 18, 2023 •
edited by frouioui
Loading

Description

This is a backport of #13654

Edit: this also backport #13045

@vitess-bot
Enable failures in tools/e2e_test_race.sh and fix races (#13654)
69f88f4 
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
@vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Sep 18, 2023

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 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 Sep 18, 2023
@github-actions github-actions bot added this to the v15.0.5 milestone Sep 18, 2023
@frouioui frouioui 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 labels Sep 18, 2023
@brendar @austenLacy
@rohit-nayak-ps @frouioui
Vttablet schema tracking: Fix _vt.schema_version corruption (#13045)
df54722 
* Copy fields from schema.Engine before modifying

This fixes a race condition which caused protobuf marshaled schema
data in _vt.schema_version rows to become corrupted when ColumnType was
modified between the time when Field message sizes were calculated
and when Field message data was written to the buffer.

Signed-off-by: Brendan Dougherty <brendan.dougherty@shopify.com>

* Acquire schema engine mutex while marshaling schema

This change is purely defensive, but it may help avoid future
race conditions caused by modifying shared schema structs while
they are being marshaled to protobuf.

Signed-off-by: Brendan Dougherty <brendan.dougherty@shopify.com>

* reorganize imports and allocate slices with make

Signed-off-by: Austen Lacy <austen.lacy@shopify.com>

* gofmt

Signed-off-by: Austen Lacy <austen.lacy@shopify.com>

* flakey unit test

Signed-off-by: Austen Lacy <austen.lacy@shopify.com>

* Use common code to update column_type for both vstreamer and rowstream events in a thread-safe fashion. Fix related tests

Signed-off-by: Rohit Nayak <rohit@planetscale.com>

* Use DBName and not keyspace name while getting extended field info!

Signed-off-by: Rohit Nayak <rohit@planetscale.com>

* Fix TestVStreamSharded

Signed-off-by: Rohit Nayak <rohit@planetscale.com>

---------

Signed-off-by: Brendan Dougherty <brendan.dougherty@shopify.com>
Signed-off-by: Austen Lacy <austen.lacy@shopify.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: Austen Lacy <austen.lacy@shopify.com>
Co-authored-by: Rohit Nayak <rohit@planetscale.com>
brendar
brendar reviewed Sep 20, 2023
View reviewed changes
go/vt/vttablet/tabletserver/schema/engine.go
for _, table := range se.tables {
dbSchema.Tables = append(dbSchema.Tables, newMinimalTable(table))
}
return dbSchema.MarshalVT()
Copy link
Contributor

Choose a reason for hiding this comment

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

@frouioui thanks for backporting this! Just wanted to note that in v15 (and v16) Vitess was still using proto.Marshal(dbSchema) rather than dbSchema.MarshalVT() for this. Not sure if it's important, or why the change was only made in later versions, but wanted to call it out in case we'd prefer to continue using proto.Marshal(dbSchema).

Copy link
Member

@frouioui frouioui Sep 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Thank you for mentioning this.

@rohit-nayak-ps do you think we should revert to proto.Marshal(dbSchema)?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, good catch. To be consistent, we should just use proto.Marshal(dbSchema) in v15/v16.

@frouioui frouioui merged commit 1814eaf into release-15.0 Oct 2, 2023
228 checks passed
@frouioui frouioui deleted the backport-13654-to-release-15.0 branch October 2, 2023 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohit-nayak-ps rohit-nayak-ps rohit-nayak-ps approved these changes

@frouioui frouioui frouioui approved these changes

@brendar brendar brendar left review comments

@harshit-gangal harshit-gangal Awaiting requested review from harshit-gangal harshit-gangal is a code owner

@systay systay Awaiting requested review from systay systay is a code owner

@shlomi-noach shlomi-noach Awaiting requested review from shlomi-noach shlomi-noach is a code owner

@mattlord mattlord Awaiting requested review from mattlord mattlord is a code owner

@deepthi deepthi Awaiting requested review from deepthi

@GuptaManan100 GuptaManan100 Awaiting requested review from GuptaManan100 GuptaManan100 is a code owner

Assignees
No one assigned
Labels
Backport This is a backport Component: Build/CI Type: Bug
Projects
None yet
Milestone
v15.0.5
Development

Successfully merging this pull request may close these issues.
3 participants
@brendar @frouioui @rohit-nayak-ps