Skip to content

Commit

Permalink
Merge #29324 #29465
Browse files Browse the repository at this point in the history 
29324: storage: fix a nasty merge deadlock r=tschottdorf,nvanbenschoten a=benesch

Fix a nasty edge case which could cause a concurrent merge and split to
deadlock. See the comment on TestStoreRangeMergeConcurrentSplit for
details.

Release note: None

29465: roachtest: add acceptance/gossip/* r=benesch a=petermattis

Move the gossip acceptance tests to roachtests.

See #29151
Fixes #29115

Co-authored-by: Nikhil Benesch <[email protected]>
Co-authored-by: Peter Mattis <[email protected]>
  • Loading branch information
@benesch @petermattis
3 people committed Sep 1, 2018
3 parents 39950bc + 90df1f1 + f65fcf9 commit d0971e5
Show file tree
Hide file tree
Showing 8 changed files with 416 additions and 420 deletions.
307 changes: 0 additions & 307 deletions pkg/acceptance/gossip_peerings_test.go
View file

This file was deleted.

82 changes: 0 additions & 82 deletions pkg/acceptance/util_gossip.go
View file

This file was deleted.

Loading

0 comments on commit d0971e5

Please sign in to comment.