Make error messages on ring merge clearer

This commit is contained in:
Bryan Boreham committed 2016-02-08 10:13:41 +00:00
1 parent 98d76e1099
commit 034da376c4
2 files changed
+18 -11

No files matched your search

+14 -8
View File
@@ -40,12 +40,19 @@ var (
ErrTokenOutOfRange = errors.New("Token is out of range") ErrTokenOutOfRange = errors.New("Token is out of range")
ErrDifferentSeeds = errors.New("Received ring was seeded differently from ours!") ErrDifferentSeeds = errors.New("Received ring was seeded differently from ours!")
ErrDifferentRange = errors.New("Received range differs from ours!") ErrDifferentRange = errors.New("Received range differs from ours!")
ErrNewerVersion = errors.New("Received new version for entry I own!")
ErrInvalidEntry = errors.New("Received invalid state update!")
ErrEntryInMyRange = errors.New("Received new entry in my range!")
ErrNotFound = errors.New("No entries for peer found") ErrNotFound = errors.New("No entries for peer found")
) )
func errInconsistentEntry(mine, theirs *entry) error {
return fmt.Errorf("Inconsistent entries for %s: owned by %s but incoming message says %s", mine.Token, mine.Peer, theirs.Peer)
}
func errEntryInMyRange(theirs *entry) error {
return fmt.Errorf("Peer %s says it owns the IP range from %s, which I think I own", theirs.Peer, theirs.Token)
}
func errNewerVersion(mine, theirs *entry) error {
return fmt.Errorf("Received update for IP range I own at %s v%d: incoming message says owner %s v%d", mine.Token, mine.Version, theirs.Peer, theirs.Version)
}
func (r *Ring) checkInvariants() error { func (r *Ring) checkInvariants() error {
if !sort.IsSorted(r.Entries) { if !sort.IsSorted(r.Entries) {
return ErrNotSorted return ErrNotSorted
@@ -224,7 +231,7 @@ func (r *Ring) Merge(gossip Ring) error {
case mine.Token > theirs.Token: case mine.Token > theirs.Token:
// insert, checking that a range owned by us hasn't been split // insert, checking that a range owned by us hasn't been split
if previousOwner != nil && *previousOwner == r.Peer && theirs.Peer != r.Peer { if previousOwner != nil && *previousOwner == r.Peer && theirs.Peer != r.Peer {
return ErrEntryInMyRange return errEntryInMyRange(theirs)
} }
addToResult(*theirs) addToResult(*theirs)
previousOwner = nil previousOwner = nil
@@ -234,14 +241,13 @@ func (r *Ring) Merge(gossip Ring) error {
switch { switch {
case mine.Version >= theirs.Version: case mine.Version >= theirs.Version:
if mine.Version == theirs.Version && !mine.Equal(theirs) { if mine.Version == theirs.Version && !mine.Equal(theirs) {
common.Log.Debugf("Error merging entries at %s - %v != %v", mine.Token, mine, theirs) return errInconsistentEntry(mine, theirs)
return ErrInvalidEntry
} }
addToResult(*mine) addToResult(*mine)
previousOwner = &mine.Peer previousOwner = &mine.Peer
case mine.Version < theirs.Version: case mine.Version < theirs.Version:
if mine.Peer == r.Peer { // We shouldn't receive updates to our own tokens if mine.Peer == r.Peer { // We shouldn't receive updates to our own tokens
return ErrNewerVersion return errNewerVersion(mine, theirs)
} }
addToResult(*theirs) addToResult(*theirs)
previousOwner = nil previousOwner = nil
@@ -262,7 +268,7 @@ func (r *Ring) Merge(gossip Ring) error {
for ; j < len(gossip.Entries); j++ { for ; j < len(gossip.Entries); j++ {
theirs = gossip.Entries[j] theirs = gossip.Entries[j]
if previousOwner != nil && *previousOwner == r.Peer && theirs.Peer != r.Peer { if previousOwner != nil && *previousOwner == r.Peer && theirs.Peer != r.Peer {
return ErrEntryInMyRange return errEntryInMyRange(theirs)
} }
addToResult(*theirs) addToResult(*theirs)
previousOwner = nil previousOwner = nil
+4 -3
View File
@@ -225,17 +225,18 @@ func TestMergeErrors(t *testing.T) {
ring2 = New(start, end, peer2name) ring2 = New(start, end, peer2name)
ring1.Entries = []*entry{{Token: start, Peer: peer1name}} ring1.Entries = []*entry{{Token: start, Peer: peer1name}}
ring2.Entries = []*entry{{Token: start, Peer: peer1name, Version: 1}} ring2.Entries = []*entry{{Token: start, Peer: peer1name, Version: 1}}
require.True(t, ring1.Merge(*ring2) == ErrNewerVersion, "Expected ErrNewerVersion") fmt.Println(ring1.Merge(*ring2))
require.Error(t, ring1.Merge(*ring2), "Expected error")
// Cannot Merge two entries with same version but different hosts // Cannot Merge two entries with same version but different hosts
ring1.Entries = []*entry{{Token: start, Peer: peer1name}} ring1.Entries = []*entry{{Token: start, Peer: peer1name}}
ring2.Entries = []*entry{{Token: start, Peer: peer2name}} ring2.Entries = []*entry{{Token: start, Peer: peer2name}}
require.True(t, ring1.Merge(*ring2) == ErrInvalidEntry, "Expected ErrInvalidEntry") require.Error(t, ring1.Merge(*ring2), "Expected error")
// Cannot Merge an entry into a range I own // Cannot Merge an entry into a range I own
ring1.Entries = []*entry{{Token: start, Peer: peer1name}} ring1.Entries = []*entry{{Token: start, Peer: peer1name}}
ring2.Entries = []*entry{{Token: middle, Peer: peer2name}} ring2.Entries = []*entry{{Token: middle, Peer: peer2name}}
require.True(t, ring1.Merge(*ring2) == ErrEntryInMyRange, "Expected ErrEntryInMyRange") require.Error(t, ring1.Merge(*ring2), "Expected error")
} }
func TestMergeMore(t *testing.T) { func TestMergeMore(t *testing.T) {