Merge #4185

4185: Update cluster config constraints r=jordanschalm a=jordanschalm

- log a more useful error message if `n_clusters > n_collectors`
- remove unnecessary constraint that clusters must have at least 3 members

Co-authored-by: Jordan Schalm <[email protected]>

cmd/bootstrap/cmd/clusters.go

@@ -17,14 +17,21 @@ func constructClusterAssignment(partnerNodes, internalNodes []model.NodeInfo, se
 
 	partners := model.ToIdentityList(partnerNodes).Filter(filter.HasRole(flow.RoleCollection))
 	internals := model.ToIdentityList(internalNodes).Filter(filter.HasRole(flow.RoleCollection))
+	nClusters := flagCollectionClusters
+	nCollectors := len(partners) + len(internals)
+
+	// ensure we have at least as many collection nodes as clusters
+	if nCollectors < int(flagCollectionClusters) {
+		log.Fatal().Msgf("network bootstrap is configured with %d collection nodes, but %d clusters - must have at least one collection node per cluster",
+			nCollectors, flagCollectionClusters)
+	}
 
 	// deterministically shuffle both collector lists based on the input seed
 	// by using a different seed each spork, we will have different clusters
 	// even with the same collectors
 	partners = partners.DeterministicShuffle(seed)
 	internals = internals.DeterministicShuffle(seed)
 
-	nClusters := flagCollectionClusters
 	identifierLists := make([]flow.IdentifierList, nClusters)
 
 	// first, round-robin internal nodes into each cluster

cmd/bootstrap/cmd/constraints.go

@@ -60,13 +60,4 @@ func checkConstraints(partnerNodes, internalNodes []model.NodeInfo) {
 		partnerCOLCount += clusterPartnerCount
 		internalCOLCount += clusterInternalCount
 	}
-
-	// ensure we have enough total collectors
-	totalCollectors := partnerCOLCount + internalCOLCount
-	if totalCollectors < flagCollectionClusters*minNodesPerCluster {
-		log.Fatal().Msgf(
-			"will not bootstrap configuration with insufficient # of collectors for cluster count: "+
-				"(total_collectors=%d, clusters=%d, min_total_collectors=%d)",
-			totalCollectors, flagCollectionClusters, flagCollectionClusters*minNodesPerCluster)
-	}
 }