Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Fix ring fuzz-test #1342

Merged
merged 2 commits into from
Aug 20, 2015
Merged

Fix ring fuzz-test #1342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca6e548
Fix Transfer() when removing a peer, so we actually target the other …
bboreham Aug 20, 2015
135c34a
Don't remove peer from table until after we've copied its entries out
bboreham Aug 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ipam/ring/ring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ func TestFuzzRing(t *testing.T) {
}

func TestFuzzRingHard(t *testing.T) {
//common.InitDefaultLogging(true)
//common.SetLogLevel("debug")
var (
numPeers = 100
iterations = 3000
Expand Down Expand Up @@ -635,13 +635,8 @@ func TestFuzzRingHard(t *testing.T) {
return
}

// Pick one peer to remove, and a different one to transfer to
peerIndex, peername, _ := randomPeer(-1)
// Remove peer from our state
peers = append(peers[:peerIndex], peers[peerIndex+1:]...)
rings = append(rings[:peerIndex], rings[peerIndex+1:]...)
theRanges = make(map[int][]address.Range)

// Transfer the space for this peer on another peer, but not this one
_, otherPeername, otherRing := randomPeer(peerIndex)

// We need to be in a ~converged ring to rmpeer
Expand All @@ -650,7 +645,12 @@ func TestFuzzRingHard(t *testing.T) {
}

common.Debug.Printf("%s: transferring from peer %s", otherPeername, peername)
otherRing.Transfer(peername, peername)
otherRing.Transfer(peername, otherPeername)

// Remove peer from our state
peers = append(peers[:peerIndex], peers[peerIndex+1:]...)
rings = append(rings[:peerIndex], rings[peerIndex+1:]...)
theRanges = make(map[int][]address.Range)

// And now tell everyone about the transfer - rmpeer is
// not partition safe
Expand Down