Skip to content

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

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/remDelayedRetry
Feb 12, 2019
Merged

kv: delete TestDelayedBeginRetryable, which was replaced by unit tests#34786
craig[bot] merged 1 commit intocockroachdb:masterfrom
nvb:nvanbenschoten/remDelayedRetry

Conversation

@nvb
Copy link
Copy Markdown
Contributor

@nvb nvb commented Feb 11, 2019

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
@nvb nvb requested review from a team and andreimatei February 11, 2019 18:52
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
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)

@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Feb 12, 2019

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 12, 2019

Build failed

@nvb
Copy link
Copy Markdown
Contributor Author

nvb commented Feb 12, 2019

Bors compilation flake? Going for another round before diving in

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 12, 2019

Build failed (retrying...)

@craig
Copy link
Copy Markdown
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
Copy Markdown
Contributor

craig bot commented Feb 12, 2019

Build succeeded

@craig craig bot merged commit 2e23ae5 into cockroachdb:master Feb 12, 2019
@nvb nvb 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