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: fix GenerateForcedRetryableError to return a bumped epoch #75165

Merged

Conversation

lidorcarmel
Copy link
Contributor

This is needed for PR #74563, where we change how txn is reset.
Without this change GenerateForcedRetryableError returns an
error with an inner txn that has an epoch 0. With this change
the epoch is copied from the original txn.

Release note: None

This is needed for PR cockroachdb#74563, where we change how txn is reset.
Without this change GenerateForcedRetryableError returns an
error with an inner txn that has an epoch 0. With this change
the epoch is copied from the original txn.

Release note: None
@lidorcarmel lidorcarmel requested a review from a team as a code owner January 19, 2022 19:25
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@lidorcarmel
Copy link
Contributor Author

thanks!
bors r+

craig bot pushed a commit that referenced this pull request Jan 19, 2022
73062: physicalplan: add support for multi-stage execution of covar_pop. r=yuzefovich a=mneverov

physicalplan: add support for multi-stage execution of covar_pop.

See #58347.

Release note (performance improvement): `covar_pop` aggregate function is now
evaluated more efficiently in a distributed setting.

75148: sql/rowenc: avoid panic when encoding delete preserving index r=rhu713 a=stevendanna

It appears, we can occasionally be asked to encode empty KVs. Notably,
this seems to happen along the delete path when multiple column
families are in play.

The included test case mirrors the case that caught this bug on an
in-progress branch. Namely, a "temporary" index used by the new index
backfiller during a primary key change.

Release note: None

75160: build: add utility function to merge test xml's r=rail a=rickystewart

The `stress` utility runs tests many times to accumulate results, so
we'd like some code to merge multiple `test.xml` files into a single
one.

Release note: None

75165: kv: fix GenerateForcedRetryableError to return a bumped epoch r=lidorcarmel a=lidorcarmel

This is needed for PR #74563, where we change how txn is reset.
Without this change GenerateForcedRetryableError returns an
error with an inner txn that has an epoch 0. With this change
the epoch is copied from the original txn.

Release note: None

75169: vendor: pull in latest version of `stress` r=rail a=rickystewart

Pull in the latest version of `stress` including these changes:

```
43d99a9 Merge pull request #13 from cockroachdb/bazelsharding
01690a1 stress: add `-bazel` support, support for sharding artifacts
```

Release note: None

Co-authored-by: Max Neverov <neverov.max@gmail.com>
Co-authored-by: Steven Danna <danna@cockroachlabs.com>
Co-authored-by: Ricky Stewart <ricky@cockroachlabs.com>
Co-authored-by: Lidor Carmel <lidor@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented Jan 19, 2022

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jan 20, 2022

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jan 20, 2022

Build succeeded:

@craig craig bot merged commit 506412f into cockroachdb:master Jan 20, 2022
@lidorcarmel lidorcarmel deleted the lidor_forced_error_bumps_epoch branch February 15, 2022 18:05
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.

None yet

3 participants