Tags: xiaoronglv/cockroach
Tags
Merge pull request cockroachdb#41501 from lucy-zhang/backport19.2-41479 release-19.2: backupccl: fix sanitizeLocalityKV() char handling
Merge cockroachdb#41413 41413: release-19.2: Revert "Merge cockroachdb#41307" r=andreimatei a=andreimatei Backport 1/1 commits from cockroachdb#41406. /cc @cockroachdb/release --- This reverts commit 1c99165, reversing changes made to e6e9161. Somehow cockroachdb#41307 broke some Jepsen tests. Reversing while I investigate. Fixes cockroachdb#41376 Fixes cockroachdb#41364 Fixes cockroachdb#41363 Fixes cockroachdb#41362 Release justification: broke Jepsen Release note: None Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
Merge cockroachdb#41413 41413: release-19.2: Revert "Merge cockroachdb#41307" r=andreimatei a=andreimatei Backport 1/1 commits from cockroachdb#41406. /cc @cockroachdb/release --- This reverts commit 1c99165, reversing changes made to e6e9161. Somehow cockroachdb#41307 broke some Jepsen tests. Reversing while I investigate. Fixes cockroachdb#41376 Fixes cockroachdb#41364 Fixes cockroachdb#41363 Fixes cockroachdb#41362 Release justification: broke Jepsen Release note: None Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
Merge cockroachdb#41307 41307: sql: fix various problematic uses of the txn in DistSQL flows r=andreimatei a=andreimatei see individual commits Release justification: Fixes bad bugs. Co-authored-by: Andrei Matei <andrei@cockroachlabs.com>
Merge cockroachdb#41171 41171: storage: don't crash when applying side-effects of old ChangeReplicas trigger r=nvanbenschoten a=nvanbenschoten Fixes cockroachdb#41155. Fixes cockroachdb#41147. The fix in cockroachdb#41148 avoided a crash when staging a ChangeReplicas trigger with a DeprecatedNextReplicaID in an application batch, but there was another bug where applying the side-effects of such a command still caused a crash. This commit fixes the crash and extends the test added in cockroachdb#41148 to go through the whole process of applying the command (which would have caught the second crash as well). Release justification: fixes a crash in mixed version clusters. Release note: None Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Merge cockroachdb#41171 41171: storage: don't crash when applying side-effects of old ChangeReplicas trigger r=nvanbenschoten a=nvanbenschoten Fixes cockroachdb#41155. Fixes cockroachdb#41147. The fix in cockroachdb#41148 avoided a crash when staging a ChangeReplicas trigger with a DeprecatedNextReplicaID in an application batch, but there was another bug where applying the side-effects of such a command still caused a crash. This commit fixes the crash and extends the test added in cockroachdb#41148 to go through the whole process of applying the command (which would have caught the second crash as well). Release justification: fixes a crash in mixed version clusters. Release note: None Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Merge cockroachdb#41148 41148: storage: don't crash when applying ChangeReplicas trigger with DeprecatedNextReplicaID r=nvanbenschoten a=nvanbenschoten Fixes cockroachdb#41145. This bug was introduced in cockroachdb#40892. This may force us to pick a new SHA for the beta. Any ChangeReplicas Raft entry from 19.1 or before is going to crash a node without it. Release justification: fixes a crash in mixed version clusters. Release note: None Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
release-19.1: util/log: ensure stderr is only redirected to th… (cock… …roachdb#40942) release-19.1: util/log: ensure stderr is only redirected to the main log
Merge pull request cockroachdb#40753 from ajkr/release-2.0-rocksdb-co… …mparator-fix release-2.0: c-deps: bump rocksdb for comparator fix
PreviousNext