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

kv: delete TestDelayedBeginRetryable, which was replaced by unit tests #34786

Merged

Conversation

nvanbenschoten
Copy link
Member

As of #33523, this test doesn't really make sense. The transaction model
is much more flexible to scenarios like this where a PushTxn is issued
before the transaction's record is written. This flexibility required
more targeted testing, which was added in #33523. As a result, we don't
need such a high-level integration test any more.

Instead, the following three subtests of TestCreateTxnRecord
sufficiently test that such a situation is handled correctly and
returns a retriable error like we were expecting:

  • TestCreateTxnRecord/begin_transaction_after_end_transaction_(abort)
  • TestCreateTxnRecord/heartbeat_transaction_after_end_transaction_(abort)
  • TestCreateTxnRecord/end_transaction_(commit)_after_end_transaction_(abort)

Release note: None

As of cockroachdb#33523, this test doesn't really make sense. The transaction model
is much more flexible to scenarios like this where a `PushTxn` is issued
before the transaction's record is written. This flexibility required
more targeted testing, which was added in cockroachdb#33523. As a result, we don't
need such a high-level integration test any more.

Instead, the following three subtests of `TestCreateTxnRecord`
sufficiently test that such a situation is handled correctly and
returns a retriable error like we were expecting:
- `TestCreateTxnRecord/begin_transaction_after_end_transaction_(abort)`
- `TestCreateTxnRecord/heartbeat_transaction_after_end_transaction_(abort)`
- `TestCreateTxnRecord/end_transaction_(commit)_after_end_transaction_(abort)`

Release note: None
@nvanbenschoten nvanbenschoten requested review from andreimatei and a team February 11, 2019 18:52
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@andreimatei andreimatei 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! 0 of 0 LGTMs obtained (waiting on @andreimatei)

@nvanbenschoten
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Feb 12, 2019

Build failed

@nvanbenschoten
Copy link
Member Author

Bors compilation flake? Going for another round before diving in

bors r+

@craig
Copy link
Contributor

craig bot commented Feb 12, 2019

Build failed (retrying...)

@craig
Copy link
Contributor

craig bot commented Feb 12, 2019

Build failed (retrying...)

craig bot pushed a commit that referenced this pull request Feb 12, 2019
34786: kv: delete TestDelayedBeginRetryable, which was replaced by unit tests r=nvanbenschoten a=nvanbenschoten

As of #33523, this test doesn't really make sense. The transaction model
is much more flexible to scenarios like this where a `PushTxn` is issued
before the transaction's record is written. This flexibility required
more targeted testing, which was added in #33523. As a result, we don't
need such a high-level integration test any more.

Instead, the following three subtests of `TestCreateTxnRecord`
sufficiently test that such a situation is handled correctly and
returns a retriable error like we were expecting:
- `TestCreateTxnRecord/begin_transaction_after_end_transaction_(abort)`
- `TestCreateTxnRecord/heartbeat_transaction_after_end_transaction_(abort)`
- `TestCreateTxnRecord/end_transaction_(commit)_after_end_transaction_(abort)`

Release note: None

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
@craig
Copy link
Contributor

craig bot commented Feb 12, 2019

Build succeeded

@craig craig bot merged commit 2e23ae5 into cockroachdb:master Feb 12, 2019
@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/remDelayedRetry branch February 15, 2019 04:26
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.

3 participants