[FAB-2689] Limit conn attempts to bootstrap peers

yacovm · yacovm · commit fda3064ab1f7 · 2017-03-08T11:47:58.000+02:00
In gossip, when a peer starts up- it tries to connect
to the bootstrap set indefinitely.
This needs to be limited up to a finite number.

Change-Id: I9a0e8290dbda5489325aa4ce3c0b2f33122b252b
Signed-off-by: Yacov Manevich &lt;yacovm@il.ibm.com&gt;
diff --git a/gossip/discovery/discovery_impl.go b/gossip/discovery/discovery_impl.go
@@ -179,7 +179,7 @@ func (d *gossipDiscoveryImpl) connect2BootstrapPeers(endpoints []string) {
 		return
 	}
 
-	for !d.somePeerIsKnown() {
+	for i := 0; i < maxConnectionAttempts && !d.somePeerIsKnown() && !d.toDie(); i++ {
 		var wg sync.WaitGroup
 		req := d.createMembershipRequest(true).NoopSign()
 		wg.Add(len(endpoints))

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (d *gossipDiscoveryImpl) connect2BootstrapPeers(endpoints []string) {`
`179`	`179`	`return`
`180`	`180`	`}`
`181`	`181`
`182`		`- for !d.somePeerIsKnown() {`
	`182`	`+ for i := 0; i < maxConnectionAttempts && !d.somePeerIsKnown() && !d.toDie(); i++ {`
`183`	`183`	`var wg sync.WaitGroup`
`184`	`184`	`req := d.createMembershipRequest(true).NoopSign()`
`185`	`185`	`wg.Add(len(endpoints))`