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

ddl: fix unstable tests #26513

Merged
merged 10 commits into from
Aug 5, 2021
Merged

ddl: fix unstable tests #26513

merged 10 commits into from
Aug 5, 2021

Conversation

wjhuang2016
Copy link
Member

@wjhuang2016 wjhuang2016 commented Jul 23, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: close #25634, close #25456

Don't delete the duplicate row.

What is changed and how it works?

Don't delete the duplicate row.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

  • No release note

@wjhuang2016
done
3d229de 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
clean
184da2d 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
Merge branch 'master' of https://github.com/pingcap/tidb into fix_uns…
59dc7cf 
…table_test
@wjhuang2016
fix
c391931 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 23, 2021
@ti-srebot
Copy link
Contributor

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Jul 23, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 23, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • xhebox
  • zimulala

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 23, 2021
bb7133
bb7133 reviewed Jul 24, 2021
View reviewed changes
ddl/db_test.go
@@ -516,8 +514,9 @@ LOOP:
// delete some rows, and add some data
for i := count; i < count+step; i++ {
n := rand.Intn(count)
// Don't delete this row, otherwise error message would change.
if n == defaultBatchSize*2-10 {
// (2048, 2038, 2038) and (2038, 2038, 2038)
Copy link
Member

Choose a reason for hiding this comment

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

I don't get the comment here. Could you add an explanation with more details?

Copy link
Member Author

Choose a reason for hiding this comment

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

These are the two duplicate rows. So we shouldn't delete either of them.

Copy link
Contributor

Choose a reason for hiding this comment

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

rand.Intn(2048) won't return 2048, according to the doc: https://pkg.go.dev/math/rand#Rand.Intn

BTW, it's a little hard to understand. Why not just remove data in the range of [0, 2037]?

Copy link
Member Author

Choose a reason for hiding this comment

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

count += step, so it may > 2048.
This test wants to randomly delete some rows. So it doesn't remove data in the range of [0, 2037] directly.
It's not easy to understand, that why I missed this check at the first fix.

zimulala
zimulala reviewed Aug 4, 2021
View reviewed changes
ddl/db_test.go Outdated Show resolved Hide resolved
@wjhuang2016 @zimulala
Update ddl/db_test.go
8085996 
Co-authored-by: Lynn <zimu_xia@126.com>
zimulala
zimulala approved these changes Aug 5, 2021
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 5, 2021
@xhebox
Copy link
Contributor

xhebox commented Aug 5, 2021

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 8085996

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 5, 2021
@zhouqiang-cl
Copy link
Contributor

fail caused by #24679

@ti-chi-bot
Copy link
Member

@wjhuang2016: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 58838a7 into pingcap:master Aug 5, 2021
@wjhuang2016 wjhuang2016 deleted the fix_unstable_test branch November 17, 2022 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 left review comments

@djshow832 djshow832 djshow832 left review comments

@zimulala zimulala zimulala approved these changes

@xhebox xhebox xhebox approved these changes

Assignees
No one assigned
Labels
sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

unstable test testDBSuite5.TestAddPrimaryKeyRollback1 unstable test testDBSuite2.TestAddUniqueIndexRollback
8 participants
@wjhuang2016 @ti-srebot @ti-chi-bot @xhebox @zhouqiang-cl @bb7133 @zimulala @djshow832