Use same gob encoder/decoder for peers and peer connections #619

awh · 2015-04-29T18:42:12Z

Partially addresses #519 by merging the first two layers of gob.

router/peers.go

@@ -25,6 +25,13 @@ type NameCollisionError struct {

 type PeerNameSet map[PeerName]struct{}

+type ConnectionView struct {


router/peers.go

@@ -233,7 +237,7 @@ func (peers *Peers) decodeUpdate(update []byte) (newPeers map[PeerName]*Peer, de
 	return
 }

-func (peers *Peers) applyUpdate(decodedUpdate []*Peer, decodedConns [][]byte) map[PeerName]*Peer {
+func (peers *Peers) applyUpdate(decodedUpdate []*Peer, decodedConns [][]ConnectionView) map[PeerName]*Peer {
 	newUpdate := make(map[PeerName]*Peer)
 	for idx, newPeer := range decodedUpdate {
 		connsBuf := decodedConns[idx]


rade · 2015-04-29T20:06:34Z

I am curious whether this change makes any difference to the time it takes NUM_WEAVES=50 bin/multiweave launch --connlimit 100 to settle. (NB: make sure you bump the kernel setting as described in bin/multiweave).

awh · 2015-04-30T12:15:15Z

I've made the suggested changes as well as introducing PeerSummary to tidy up peer encoding/decoding...

rade · 2015-04-30T13:01:56Z

The linter is moaning.

And the inclusion of ConnectionSummary in PeerSummary needs further-reaching changes to make sense, so I suggest leaving that out.

rade · 2015-05-05T21:13:03Z

This has made a massive improvement to cluster formation. Running NUM_WEAVES=50 bin/multiweave launch --connlimit=100 and measuring the time it takes from the first connection to quiescence, I get ~7 minutes on master, and ~2 minutes in this branch.

Bump protocol version due to gob restructuring

26dfc42

awh reviewed Apr 29, 2015
View reviewed changes

awh assigned rade Apr 29, 2015

rade reviewed Apr 29, 2015
View reviewed changes

rade assigned awh and unassigned rade Apr 29, 2015

awh added 2 commits April 30, 2015 13:03

Encode/decode []ConnectionSummary instead of []byte

047614b

Remove obsolete connsIterator

b48a93c

awh force-pushed the reduced_gob branch from c17480b to 89d9b5c Compare April 30, 2015 12:12

awh assigned rade and unassigned awh Apr 30, 2015

rade assigned awh and unassigned rade Apr 30, 2015

Introduce PeerSummary

ab68a1c

awh force-pushed the reduced_gob branch from 89d9b5c to ab68a1c Compare May 5, 2015 09:59

awh assigned rade and unassigned awh May 5, 2015

rade merged commit ab68a1c into weaveworks:master May 5, 2015

rade modified the milestone: 0.11.0 May 12, 2015

awh deleted the reduced_gob branch June 1, 2015 14:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use same gob encoder/decoder for peers and peer connections #619

Use same gob encoder/decoder for peers and peer connections #619

awh commented Apr 29, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

rade commented Apr 29, 2015

awh commented Apr 30, 2015

rade commented Apr 30, 2015

rade commented May 5, 2015

		@@ -25,6 +25,13 @@ type NameCollisionError struct {

		type PeerNameSet map[PeerName]struct{}

		type ConnectionView struct {

Use same gob encoder/decoder for peers and peer connections #619

Use same gob encoder/decoder for peers and peer connections #619

Conversation

awh commented Apr 29, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

rade commented Apr 29, 2015

awh commented Apr 30, 2015

rade commented Apr 30, 2015

rade commented May 5, 2015