Merge pull request #5486 from justinsb/no_gossip_limits

Remove gossip connection limit entirely
kubernetes · Jul 23, 2018 · 25e0f37 · 25e0f37
2 parents 8d52e31 + 9b70f75
commit 25e0f37
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/protokube/pkg/gossip/mesh/gossip.go b/protokube/pkg/gossip/mesh/gossip.go
@@ -41,14 +41,16 @@ type MeshGossiper struct {
 
 func NewMeshGossiper(listen string, channelName string, nodeName string, password []byte, seeds gossip.SeedProvider) (*MeshGossiper, error) {
 
-	connLimit := 64
+	connLimit := 0 // 0 means no limit
 	gossipDnsConnLimit := os.Getenv("GOSSIP_DNS_CONN_LIMIT")
 	if gossipDnsConnLimit != "" {
 		limit, err := strconv.Atoi(gossipDnsConnLimit)
 		if err != nil {
-			return nil, fmt.Errorf("cannot parse env GOSSIP_DNS_CONN_LIMIT value: %v, err:%v", gossipDnsConnLimit, err)
+			// Continue with the default value
+			glog.Warningf("cannot parse env GOSSIP_DNS_CONN_LIMIT value %q", gossipDnsConnLimit)
+		} else {
+			connLimit = limit
 		}
-		connLimit = limit
 	}
 
 	glog.Infof("gossip dns connection limit is:%d", connLimit)