Merge pull request #970 from bdarnell/gossip-err

Fix an overly-sensitive error check in gosssip.
cockroachdb · May 8, 2015 · 67ad8d8 · 67ad8d8
2 parents 7cee55b + 33d32df
commit 67ad8d8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gossip/infostore.go b/gossip/infostore.go
@@ -365,11 +365,12 @@ func (is *infoStore) combine(delta *infoStore) int {
 		i.seq = is.seqGen
 		i.Hops++
 		i.peerID = delta.NodeID
-		err := is.addInfo(i)
-		if err == nil {
+		// Errors from addInfo here are not a problem; they simply
+		// indicate that the data in *is is newer than in *delta.
+		if err := is.addInfo(i); err == nil {
 			freshCount++
 		}
-		return err
+		return nil
 	}); err != nil {
 		log.Errorf("failed to properly combine infoStores: %s", err)
 	}