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

workload/tpcc: match against correct ErrNoRows in delivery txn #122903

Merged
merged 2 commits into from
Apr 23, 2024

Conversation

nvanbenschoten
Copy link
Member

Fixes #122891.

sql.ErrNoRows is not the same as pgx.ErrNoRows. As a result, this logic has been broken since TPC-C was ported to use pgx in d15637c (2018). This commit fixes the broken logic by matching on the correct error.

Release note: None

This has been broken since it was first added in fb9a8cd.

The counter is used to perform audit checks 9.2.1.7:
> Verify that no more than 1%, or no more than one (1), whichever is
> greater, of the Delivery transactions skipped because there were fewer
> than necessary orders present in the New-Order table.

Epic: None
Release note: None
Fixes cockroachdb#122891.

`sql.ErrNoRows` is not the same as `pgx.ErrNoRows`. As a result, this
logic has been broken since TPC-C was ported to use pgx in d15637c
(2018). This commit fixes the broken logic by matching on the correct
error.

Release note: None
@nvanbenschoten nvanbenschoten requested a review from a team as a code owner April 23, 2024 16:10
@nvanbenschoten nvanbenschoten requested review from srosenberg and DarrylWong and removed request for a team April 23, 2024 16:10
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @DarrylWong and @srosenberg)

@nvanbenschoten
Copy link
Member Author

TFTR!

bors r=RaduBerinde

@craig craig bot merged commit 7953760 into cockroachdb:master Apr 23, 2024
22 checks passed
@nvanbenschoten
Copy link
Member Author

blathers backport 23.1 23.2 24.1

Copy link

blathers-crl bot commented Apr 23, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 3e7a5cc to blathers/backport-release-23.1-122903: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1 failed. See errors above.


error creating merge commit from 3e7a5cc to blathers/backport-release-23.2-122903: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2 failed. See errors above.


error creating merge commit from 3e7a5cc to blathers/backport-release-24.1-122903: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 24.1 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

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.

roachtest: tpcc-nowait/isolation-level=mixed/nodes=3/w=1 failed
3 participants