Merge branch 'master' into allow-relayed-match-error

server/config.go

@@ -287,9 +287,6 @@ func CheckConfig(logger *zap.Logger, config Config) map[string]string {
 	if config.GetMatchmaker().MaxIntervals < 1 {
 		logger.Fatal("Matchmaker max intervals must be >= 1", zap.Int("matchmaker.max_intervals", config.GetMatchmaker().MaxIntervals))
 	}
-	if config.GetMatchmaker().BatchPoolSize < 1 {
-		logger.Fatal("Matchmaker batch pool size must be >= 1", zap.Int("matchmaker.batch_pool_size", config.GetMatchmaker().BatchPoolSize))
-	}
 	if config.GetMatchmaker().RevThreshold < 0 {
 		logger.Fatal("Matchmaker reverse matching threshold must be >= 0", zap.Int("matchmaker.rev_threshold", config.GetMatchmaker().RevThreshold))
 	}
@@ -983,7 +980,6 @@ type MatchmakerConfig struct {
 	MaxTickets               int  `yaml:"max_tickets" json:"max_tickets" usage:"Maximum number of concurrent matchmaking tickets allowed per session or party. Default 3."`
 	IntervalSec              int  `yaml:"interval_sec" json:"interval_sec" usage:"How quickly the matchmaker attempts to form matches, in seconds. Default 15."`
 	MaxIntervals             int  `yaml:"max_intervals" json:"max_intervals" usage:"How many intervals the matchmaker attempts to find matches at the max player count, before allowing min count. Default 2."`
-	BatchPoolSize            int  `yaml:"batch_pool_size" json:"batch_pool_size" usage:"Number of concurrent indexing batches that will be allocated."`
 	RevPrecision             bool `yaml:"rev_precision" json:"rev_precision" usage:"Reverse matching precision. Default false."`
 	RevThreshold             int  `yaml:"rev_threshold" json:"rev_threshold" usage:"Reverse matching threshold. Default 1."`
 	AllowRelayedMatchOnError bool `yaml:"allow_relayed_match_on_error" json:"allow_relayed_match_on_error" usage:"Allow creating relayed match when authoritative matchmaker error occurs. Default true."`
@@ -994,7 +990,6 @@ func NewMatchmakerConfig() *MatchmakerConfig {
 		MaxTickets:               3,
 		IntervalSec:              15,
 		MaxIntervals:             2,
-		BatchPoolSize:            32,
 		RevPrecision:             false,
 		RevThreshold:             1,
 		AllowRelayedMatchOnError: true,