Skip to content

Commit

Permalink
Fix race in membership and ring consistency
Browse files Browse the repository at this point in the history
Without this change, membership and ring could be not in sync. Scenario:
A - current node.
B - alive (according to C).
B - suspect (according to D).
C - thinks B is faulty.
D - thinks B is alive.

At the same time:
1. C gossips A that B is faulty. A removes B to the membership list.
2. D gossips A that B is alive. A adds B from the membership list.

Changes in the ring:
3. The lock on m.members is released, so updates on Ring due to (1) and
   (2) can execute in any order. In our example, the operations are
   reversed:
3.1. A adds B to the ring list due to (2).
3.2. A removes B to the ring list due to (1).

Now B is in the membership list, but not in the ring.

This is the second iteration of the change. First iteration did not
introduce a new lock, but a new invariant: a goroutine needs to lock
both memberlist and disseminator, lock memberlist first, then
disseminator. However, the invariant caused requestAdminStats to fail on
travis-ci, and I couldn't find out why.
  • Loading branch information
motiejus committed Feb 23, 2016
1 parent 6affd85 commit f511716
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions swim/memberlist.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ type memberlist struct {
checksum uint32
sync.RWMutex
}

// Required for Update() operation. We need to keep membership list and
// hash ring atomic, so lock with this mutex in that code.
// TODO: rework locking. This mutex is the last straw. See #113
sync.Mutex
}

// newMemberlist returns a new member list
Expand Down Expand Up @@ -230,6 +235,7 @@ func (m *memberlist) Update(changes []Change) (applied []Change) {

m.node.emit(MemberlistChangesReceivedEvent{changes})

m.Lock()
m.members.Lock()

for _, change := range changes {
Expand Down Expand Up @@ -281,6 +287,7 @@ func (m *memberlist) Update(changes []Change) (applied []Change) {
m.node.rollup.TrackUpdates(applied)
}

m.Unlock()
return applied
}

Expand Down

0 comments on commit f511716

Please sign in to comment.